status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

missed conflict

This commit is contained in:
Adrian Tiberius 2016-06-30 19:14:03 +03:00
parent 4fca2507da
commit 06e0332f4f
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/status_im/handlers.cljs
View File

@ -7,12 +7,8 @@
[status-im.protocol.state.storage :as storage] [status-im.protocol.state.storage :as storage]
[status-im.utils.logging :as log] [status-im.utils.logging :as log]
[status-im.utils.crypt :refer [gen-random-bytes]] [status-im.utils.crypt :refer [gen-random-bytes]]
<<<<<<< HEAD
[status-im.utils.handlers :as u]
[status-im.components.react :refer [geth]] [status-im.components.react :refer [geth]]
=======
[status-im.utils.handlers :refer [register-handler] :as u] [status-im.utils.handlers :refer [register-handler] :as u]
>>>>>>> origin/develop
status-im.chat.handlers status-im.chat.handlers
status-im.chat.handlers.animation status-im.chat.handlers.animation
status-im.group-settings.handlers status-im.group-settings.handlers