blur

status-im · Dec 21, 2023 · c232645 · c232645
1 parent 8a90a3c
commit c232645
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/src/quo/components/settings/category/settings/view.cljs b/src/quo/components/settings/category/settings/view.cljs
@@ -7,13 +7,8 @@
     [react-native.core :as rn]))
 
 (defn- category-internal
-<<<<<<< HEAD
-  [{:keys [label data blur? container-style theme]}]
-  [rn/view {:style (merge (style/container label) container-style)}
-=======
   [{:keys [label data] :as props}]
   [rn/view {:style (style/container label)}
->>>>>>> 5007b27b2 (review)
    (when label
      [text/text
       {:weight :medium

diff --git a/src/quo/components/settings/settings_item/view.cljs b/src/quo/components/settings/settings_item/view.cljs
@@ -102,11 +102,7 @@
      nil)])
 
 (defn- internal-view
-<<<<<<< HEAD
-  [{:keys [title on-press action-props accessibility-label container-style] :as props}]
-=======
-  [{:keys [title on-press action-props accessibility-label blur?] :as props}]
->>>>>>> ccc60001f (wallet: receive screen)
+  [{:keys [title on-press action-props accessibility-label blur? container-style] :as props}]
   [rn/pressable
    {:style               (merge style/container container-style)
     :on-press            on-press