lint

src/status_im/contexts/wallet/common/utils.cljs

@@ -275,10 +275,7 @@
 (defn get-balance-for-chain
   [data chain-id]
   (some #(when (= chain-id (:chain-id %)) %) (vals data)))
-<<<<<<< HEAD
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 (defn make-network-item
   "This function generates props for quo/category component item"
   [{:keys [network-name] :as _network}
@@ -298,14 +295,8 @@
     label-props
     (assoc :label       :text
            :label-props label-props)))
-=======
-(defn string-to-vector [str]
-=======
+
 (defn string-to-vector
   [str]
->>>>>>> 86465d80f (lint)
   (->> (clojure.string/split str #"\s")
        (vec)))
->>>>>>> 2d6aa482f (feat: new keypair)
-=======
->>>>>>> 8db6aedb6 (review)

status-go-version.json

@@ -3,13 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-<<<<<<< HEAD
-    "version": "v0.174.6",
-    "commit-sha1": "f95dd35d131f68645b7c4dc5fbcea955c16e25bd",
-    "src-sha256": "188chrifz4h3j6fpsrqq83v2vcnpp8y4282k9lhlrkkknfgwz5v2"
-=======
     "version": "b1da689ca06dfc66d47f49beb457b564e2fe6fea",
     "commit-sha1": "b1da689ca06dfc66d47f49beb457b564e2fe6fea",
     "src-sha256": "0wvmj9536nf8j4x9vs7l7gyxbsbkfnjzh77fwvdxnpiwpps134d1"
->>>>>>> 2d6aa482f (feat: new keypair)
 }

translations/en.json

@@ -2504,36 +2504,10 @@
     "origin-header": "Origin",
     "origin-desc": "Origin is where your key pair (your private and public key) comes from. You can generate a new key pair or import an existing private key.",
     "derivation-path-header": "Derivation path",
-<<<<<<< HEAD
-<<<<<<< HEAD
     "derivation-path-desc": "Derivation paths are the routes your Status Wallet uses to generate addresses from your private key.",
-    "select-networks": "Select networks"
-=======
-    "derivation-path-desc": "Derivation paths are the routes your Status Wallet uses to generate addresses from your private key."
-=======
-<<<<<<< HEAD
-    "fees": "Fees"
-=======
-=======
-    "fees": "Fees",
->>>>>>> 6466e571e (lint)
-=======
-    "derivation-path-desc": "Derivation paths are the routes your Status Wallet uses to generate addresses from your private key.",
->>>>>>> af279973a (lint)
+    "select-networks": "Select networks",
     "generating-keypair": "Generating keypair...",
     "keypair-name": "Keypair name",
     "keypair-name-description": "Name keypair for your own personal reference",
     "keypair-name-input-placeholder": "Collectibles account, Old vault...."
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> dde847888 (feat: new keypair)
->>>>>>> ed51b8caf (feat: new keypair)
-<<<<<<< HEAD
->>>>>>> 2d6aa482f (feat: new keypair)
-=======
-=======
->>>>>>> 6466e571e (lint)
->>>>>>> 0fcf60d03 (lint)
-=======
->>>>>>> af279973a (lint)
 }