conflict fixed

Netflix · Oct 15, 2014 · 4ab5e8e · 4ab5e8e
1 parent c7f3416
commit 4ab5e8e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/suro-elasticsearch/src/main/java/com/netflix/suro/sink/elasticsearch/ElasticSearchSink.java b/suro-elasticsearch/src/main/java/com/netflix/suro/sink/elasticsearch/ElasticSearchSink.java
@@ -257,11 +257,8 @@ public void run() {
                     }
                 }
 
-<<<<<<< HEAD
                 throughput.increment(response.getItems().length);
 
-=======
->>>>>>> c5befb3772a0298d42dd4085c17beff919156559
                 indexDelay.set(
                         System.currentTimeMillis() - indexInfo.create((Message) request.payloads().get(0)).getTimestamp());
             }