lint

.clj-kondo/nubank/matcher-combinators/config.edn

@@ -0,0 +1,4 @@
+{:linters
+ {:unresolved-symbol
+  {:exclude [(cljs.test/is [match? thrown-match?])
+             (clojure.test/is [match? thrown-match?])]}}}

.clj-kondo/rewrite-clj/rewrite-clj/config.edn

@@ -0,0 +1,5 @@
+{:lint-as
+ {rewrite-clj.zip/subedit-> clojure.core/->
+  rewrite-clj.zip/subedit->> clojure.core/->>
+  rewrite-clj.zip/edit-> clojure.core/->
+  rewrite-clj.zip/edit->> clojure.core/->>}}

src/status_im2/contexts/profile/login/events.cljs

@@ -128,14 +128,6 @@
                 (assoc :chat/open-last-chat (get-in db [:profile/profile :key-uid]))
                 notifications-enabled?
                 (assoc :effects/push-notifications-enable nil))
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-              (rf/dispatch [:wallet/initialize])
-=======
->>>>>>> 02bd47b16 (lint)
-              (transport/start-messenger)
->>>>>>> 2699d7224 (wallet: add color and emoji)
               (contacts/initialize-contacts)
               (browser/initialize-browser)
               (mobile-network/on-network-status-change)

src/status_im2/subs/wallet/wallet.cljs

@@ -94,16 +94,11 @@
  :-> :current-viewing-account-address)
 
 (rf/reg-sub
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 823fc3666 (lint)
  :wallet/accounts-without-current-viewing-account
  :<- [:wallet/accounts]
  :<- [:wallet/current-viewing-account-address]
  (fn [[accounts current-viewing-account-address]]
    (remove #(= (:address %) current-viewing-account-address) accounts)))
-<<<<<<< HEAD
 
 (defn- calc-token-value
   [{:keys [market-values-per-currency] :as item} chain-id]
@@ -130,12 +125,3 @@
  :<- [:chain-id]
  (fn [[current-account chain-id]]
    (mapv #(calc-token-value % chain-id) (:tokens current-account))))
-=======
-  :wallet/accounts-without-current-viewing-account
-  :<- [:wallet/accounts]
-  :<- [:wallet/current-viewing-account-address]
-  (fn [[accounts current-viewing-account-address]]
-    (remove #(= (:address %) current-viewing-account-address) accounts)))
->>>>>>> c624805bb (rebase)
-=======
->>>>>>> 823fc3666 (lint)

status-go-version.json

@@ -3,42 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     "version": "v0.171.28",
     "commit-sha1": "d7e7792b51f79e8cbebc9f59de79e64b6f6e684a",
     "src-sha256": "0y0di4jfmk93pqc4i9fsgasrhqgvwh46ly5h04m87pm611faa2ay"
-=======
-=======
->>>>>>> 2838840c8 (update status-go)
-<<<<<<< HEAD
-    "version": "v0.171.27",
-    "commit-sha1": "76b6745666b945f8d6336e2a5fc6e5705985273d",
-    "src-sha256": "1amak99bpsx6j8grzm2kzwd3si34gg4r8kbxqmnkfsrkm2nzvbx1"
-=======
-    "version": "c7278b9322cca78a648b151e53534702ed4b7166",
-    "commit-sha1": "c7278b9322cca78a648b151e53534702ed4b7166",
-    "src-sha256": "13h2wc5gcay196bjvcgcixzvncdw372yrabsx6gnr82phbw9py6l"
->>>>>>> c1d06ad1d (wallet: add color and emoji)
-<<<<<<< HEAD
->>>>>>> 2699d7224 (wallet: add color and emoji)
-=======
-=======
-    "version": "08d32d39c0d7b0550f1110df8cebfd5da5691ac7",
-    "commit-sha1": "08d32d39c0d7b0550f1110df8cebfd5da5691ac7",
-    "src-sha256": "10vzgyq3sspylxyxffig34l8sd8ryvghkkmagjrr06azsqsyp1mf"
->>>>>>> 5c9afe65b (update status-go)
->>>>>>> 2838840c8 (update status-go)
-=======
-    "version": "1174e1e43c0fbffaa21c9401c29e98cbdc37557c",
-    "commit-sha1": "1174e1e43c0fbffaa21c9401c29e98cbdc37557c",
-    "src-sha256": "1q5l9aimdiyryzvbd10djvz5ghg6ccaghwmqp2456skbvflpbyr2"
->>>>>>> c624805bb (rebase)
-=======
-    "version": "v0.171.28",
-    "commit-sha1": "d7e7792b51f79e8cbebc9f59de79e64b6f6e684a",
-    "src-sha256": "0y0di4jfmk93pqc4i9fsgasrhqgvwh46ly5h04m87pm611faa2ay"
->>>>>>> 809b384d1 (rebase)
 }