lint

status-im · Jul 16, 2024 · 1963d47 · 1963d47
1 parent 83a2a24
commit 1963d47
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/translations/en.json b/translations/en.json
@@ -2758,10 +2758,7 @@
     "swaps-powered-by": "Swaps powered by {{provider}}",
     "max-slippage": "Max slippage",
     "pay": "Pay",
-<<<<<<< HEAD
-    "store-confirmations": "Store confirmations"
-=======
+    "store-confirmations": "Store confirmations",
     "tokens": "tokens",
     "collectible": "collectible"
->>>>>>> c6c9400408 (collectible unpreferred alert)
 }