Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit b40cc11

Browse files
authored
Remove incidental diff syntax
1 parent d443368 commit b40cc11

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

src/i18n/strings/en_EN.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,5 +971,4 @@
971971
"Failed to upload image": "Failed to upload image",
972972
"Failed to update group": "Failed to update group",
973973
"Hide avatars in user and room mentions": "Hide avatars in user and room mentions"
974-
>>>>>>> 472b5b53502cfbb51be8218d09409c97e86bfcc7
975974
}

0 commit comments

Comments
 (0)