Skip to content

Commit e64b851

Browse files
committed
lint
1 parent ffe6169 commit e64b851

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

src/status_im2/contexts/quo_preview/main.cljs

-7
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,7 @@
9494
[status-im2.contexts.quo-preview.tags.tags :as tags]
9595
[status-im2.contexts.quo-preview.tags.token-tag :as token-tag]
9696
[status-im2.contexts.quo-preview.title.title :as title]
97-
<<<<<<< HEAD
98-
[status-im2.contexts.quo-preview.wallet.lowest-price :as lowest-price]
99-
[status-im2.contexts.quo-preview.wallet.network-amount :as network-amount]
100-
[status-im2.contexts.quo-preview.wallet.network-breakdown :as network-breakdown]
101-
[status-im2.contexts.quo-preview.wallet.token-overview :as token-overview]
102-
=======
10397
[status-im2.contexts.quo-preview.settings.category :as category]
104-
>>>>>>> 7d2e95c55 (feat: network amount comp)
10598
[status-im2.contexts.quo-preview.keycard.keycard :as keycard]
10699
[status-im2.contexts.quo-preview.loaders.skeleton :as skeleton]
107100
[status-im2.contexts.quo-preview.community.channel-actions :as channel-actions]

0 commit comments

Comments
 (0)