OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove incidental diff syntax

pull/21833/head
Luke Barnard 2017-08-15 15:03:25 +01:00 committed by GitHub
parent d443368aa3
commit b40cc111bd
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/i18n/strings/en_EN.json
View File

@ -971,5 +971,4 @@
"Failed to upload image": "Failed to upload image", "Failed to upload image": "Failed to upload image",
"Failed to update group": "Failed to update group", "Failed to update group": "Failed to update group",
"Hide avatars in user and room mentions": "Hide avatars in user and room mentions" "Hide avatars in user and room mentions": "Hide avatars in user and room mentions"
>>>>>>> 472b5b53502cfbb51be8218d09409c97e86bfcc7
} }