lint

status-im · Dec 21, 2023 · 3d1a3dd · 3d1a3dd
1 parent 033f5e4
commit 3d1a3dd
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/quo/core_spec.cljs b/src/quo/core_spec.cljs
@@ -93,20 +93,10 @@
     [quo.components.wallet.wallet-activity.component-spec]
     [quo.components.wallet.wallet-overview.component-spec]))
 
-<<<<<<< HEAD
   ;; [quo.components.inputs.address-input.component-spec]
   ;; [quo.components.inputs.title-input.component-spec]
   ;; [quo.components.list-items.account.component-spec]
   ;; [quo.components.list-items.address.component-spec]
   ;; [quo.components.list-items.saved-address.component-spec]
   ;; [quo.components.list-items.saved-contact-address.component-spec]
   ;; [quo.components.list-items.token-network.component-spec]
-=======
-;; [quo.components.inputs.address-input.component-spec]
-;; [quo.components.inputs.title-input.component-spec]
-;; [quo.components.list-items.account.component-spec]
-;; [quo.components.list-items.address.component-spec]
-;; [quo.components.list-items.saved-address.component-spec]
-;; [quo.components.list-items.saved-contact-address.component-spec]
-;; [quo.components.list-items.token-network.component-spec]
->>>>>>> 63954db3a (lint)