missed conflict

2016-06-30 19:14:03 +03:00 · 2016-06-30 19:14:03 +03:00 · 06e0332f4f
parent 4fca2507da
commit 06e0332f4f
1 changed files with 0 additions and 4 deletions
--- 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