From 4ab5e8e6c59682007a1f2eab56deb29bb4bc3ed2 Mon Sep 17 00:00:00 2001
From: Jae Hyeon Bae <metacret@gmail.com>
Date: Tue, 14 Oct 2014 18:02:51 -0700
Subject: [PATCH] conflict fixed

---
 .../com/netflix/suro/sink/elasticsearch/ElasticSearchSink.java | 3 ---
 1 file changed, 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
index 41566058..31a06b9f 100644
--- 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());
             }