File tree 1 file changed +0
-7
lines changed
src/status_im2/contexts/quo_preview
1 file changed +0
-7
lines changed Original file line number Diff line number Diff line change 94
94
[status-im2.contexts.quo-preview.tags.tags :as tags]
95
95
[status-im2.contexts.quo-preview.tags.token-tag :as token-tag]
96
96
[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
- =======
103
97
[status-im2.contexts.quo-preview.settings.category :as category]
104
- >>>>>>> 7 d2e95c55 (feat: network amount comp)
105
98
[status-im2.contexts.quo-preview.keycard.keycard :as keycard]
106
99
[status-im2.contexts.quo-preview.loaders.skeleton :as skeleton]
107
100
[status-im2.contexts.quo-preview.community.channel-actions :as channel-actions]
You can’t perform that action at this time.
0 commit comments