lint

status-im · Jun 13, 2024 · a034453 · a034453
1 parent 45f5272
commit a034453
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/src/status_im/contexts/wallet/db.cljs b/src/status_im/contexts/wallet/db.cljs
@@ -6,16 +6,5 @@
    :selected-networks (set constants/default-network-names)})
 
 (def defaults
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-  {:ui {:network-filter network-filter-defaults}})
-=======
-=======
->>>>>>> 2d5d98343 (lint)
-<<<<<<< HEAD
-=======
->>>>>>> 42efc642a (lint)
   {:ui {:network-filter  network-filter-defaults
         :tokens-loading? true}})
->>>>>>> 3498d19b2 (lint)