status-im/open-bounty
2
0
Fork 0
mirror of https://github.com/status-im/open-bounty.git synced 2025-01-25 00:39:01 +00:00
Code Issues Projects Releases Wiki Activity

Remove trailing conflict marker

Browse Source
This commit is contained in:
Vitaliy Vlasov 2018-02-09 15:39:08 +02:00
parent 186d989006
commit 5e8cb562b7
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cljs/commiteth/db.cljs
View File

@ -21,4 +21,3 @@
:owner-bounties {}
:top-hunters []
:activity-feed []})
>>>>>>> develop