lint

Author: OmarBasem

src/quo2/core_spec.cljs

@@ -53,15 +53,5 @@
     [quo2.components.wallet.account-card.component-spec]
     [quo2.components.wallet.network-amount.component-spec]
     [quo2.components.wallet.network-bridge.component-spec]
-<<<<<<< HEAD
     [quo2.components.wallet.token-input.component-spec]
     [quo2.components.wallet.wallet-overview.component-spec]))
-=======
-    [quo2.components.wallet.account-card.component-spec]
-<<<<<<< HEAD
-    [quo2.components.wallet.token-input.component-spec]
-    [quo2.components.list-items.token-value.component-spec]))
->>>>>>> 44d5d4d15 (add test)
-=======
-    [quo2.components.wallet.token-input.component-spec]))
->>>>>>> 602b54f94 (review)