From 06e0332f4fc36d269e6a9b688db3129d3c7529c3 Mon Sep 17 00:00:00 2001
From: Adrian Tiberius <adrian.tiberius@gmail.com>
Date: Thu, 30 Jun 2016 19:14:03 +0300
Subject: [PATCH] missed conflict

---
 src/status_im/handlers.cljs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/status_im/handlers.cljs b/src/status_im/handlers.cljs
index f9280d8a0f..cd3ce76f44 100644
--- a/src/status_im/handlers.cljs
+++ b/src/status_im/handlers.cljs
@@ -7,12 +7,8 @@
     [status-im.protocol.state.storage :as storage]
     [status-im.utils.logging :as log]
     [status-im.utils.crypt :refer [gen-random-bytes]]
-<<<<<<< HEAD
-    [status-im.utils.handlers :as u]
     [status-im.components.react :refer [geth]]
-=======
     [status-im.utils.handlers :refer [register-handler] :as u]
->>>>>>> origin/develop
     status-im.chat.handlers
     status-im.chat.handlers.animation
     status-im.group-settings.handlers