rebase

status-im · Dec 19, 2022 · e0a0e1d · e0a0e1d
1 parent 749774e
commit e0a0e1d
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/translations/en.json b/translations/en.json
@@ -1897,7 +1897,6 @@
     "remove-user-from-group": "Remove {{username}} from the group",
     "edit-name-image": "Edit name and image",
     "owner": "Owner",
-<<<<<<< HEAD
     "local-pairing-experimental-mode": "Local Pairing Mode (alpha)",
     "syncing": "Syncing",
     "synced-devices": "Synced Devices",
@@ -1912,8 +1911,6 @@
     "try-your-luck-again": "Try your luck again!",
     "instruction-after-qr-generated": "On your other device, navigate to the Syncing screen and select “Scan sync”",
     "show-existing-keys": "Show Existing Keys",
-    "scan-sync-code": "Scan Sync Code"
-=======
+    "scan-sync-code": "Scan Sync Code",
     "online": "Online"
->>>>>>> babab2fb0... qa fixes
 }