lint

translations/en.json

@@ -2394,21 +2394,15 @@
     "address-copied": "Address copied",
     "no-dapps-description": "We want dApps!",
     "select-asset": "Select asset",
-<<<<<<< HEAD
     "send-limit": "Max: {{limit}}",
     "searching-for-activity": "Searching for activity...",
     "this-address-has-no-activity": "This address has no activity",
-    "this-address-has-activity": "This address has activity"   
-=======
+    "this-address-has-activity": "This address has activity",
     "generate-new-keypair": "Generate new keypair",
     "import-using-phrase": "Import using recovery phrase",
     "import-from-keycard": "Import from Keycard",
     "import-private-key": "Import private key",
     "backup-recovery-phrase": "Backup recovery phrase",
-<<<<<<< HEAD
-    "backup-recovery-phrase-description": "Save in a secure place that only you control, these 12 words give access to all of your funds."
->>>>>>> 81ead525f (u)
-=======
     "backup-recovery-phrase-description": "Save in a secure place that only you control, these 12 words give access to all of your funds.",
     "how-to-backup": "How to backup your recovery phrase",
     "backup-step-1": "Find pen and paper",
@@ -2418,5 +2412,4 @@
     "reveal-phrase": "Reveal phrase",
     "i-have-written": "I have written it down on paper",
     "next-you-will": "Next, you will be asked to confirm the position of certain words in your recovery phrase"
->>>>>>> ca47ad7d5 (feat: new keypair flow ui)
 }