Skip to content

Commit da96b34

Browse files
committed
lint
1 parent 78817f0 commit da96b34

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

translations/en.json

+2-11
Original file line numberDiff line numberDiff line change
@@ -2562,17 +2562,8 @@
25622562
"one": "1 address",
25632563
"other": "{{count}} addresses"
25642564
},
2565-
<<<<<<< HEAD
2566-
<<<<<<< HEAD
2567-
"max": "Max: {{number}}"
2568-
=======
2569-
"key-name-error-1": "Key name too long",
2570-
"key-name-error-2": "Emojis are not allowed",
2571-
"key-name-error-3": "Special characters are not allowed",
2572-
>>>>>>> ed9f1cb22 (feat: keypair name handling)
2573-
=======
2565+
"max": "Max: {{number}}",
25742566
"key-name-error-length": "Key name too long",
25752567
"key-name-error-emoji": "Emojis are not allowed",
2576-
"key-name-error-special-char": "Special characters are not allowed",
2577-
>>>>>>> 4cf522471 (review)
2568+
"key-name-error-special-char": "Special characters are not allowed"
25782569
}

0 commit comments

Comments
 (0)