Conflicts

status-im · Sep 20, 2022 · 52abead · 52abead
1 parent 80a7ca8
commit 52abead
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/src/quo2/components/avatars/user_avatar.cljs b/src/quo2/components/avatars/user_avatar.cljs
@@ -82,22 +82,11 @@
    :border-radius inner-dimensions})
 
 (defn container [inner-dimensions outer-dimensions & children]
-<<<<<<< HEAD
   [rn/view {:style (merge {:background-color (colors/custom-color-by-theme :turquoise 50 60)
                            :justify-content :center
                            :align-items :center}
                           (container-styling inner-dimensions outer-dimensions))}
    children])
-=======
-  (let [bg-theme :light]
-    [rn/view {:style (merge {:background-color (colors/custom-color
-                                                :turquoise
-                                                bg-theme)
-                             :justify-content :center
-                             :align-items :center}
-                            (container-styling inner-dimensions outer-dimensions))}
-     children]))
->>>>>>> 53d88abe3 (Implement wallet account switcher)
 
 (def small-sizes #{:xs :xxs :xxxs})
 (def identicon-sizes #{:big :medium :small})

diff --git a/src/quo2/screens/main.cljs b/src/quo2/screens/main.cljs
@@ -152,11 +152,7 @@
                         :padding-top        (:top insets)
                         :padding-bottom     8
                         :padding-horizontal 16
-<<<<<<< HEAD
                         :background-color   (colors/theme-colors colors/white colors/neutral-90)}
-=======
-                        :background-color   (:quo2-preview-background @colors/theme)}
->>>>>>> 5fbe1128f (Testing bools)
         [theme-switcher]
         [quo2-text/text {:size :heading-1} "Preview Quo2 Components"]
         [rn/view