Remove incidental diff syntax

This commit is contained in:
Luke Barnard 2017-08-15 15:03:25 +01:00 committed by GitHub
parent d443368aa3
commit b40cc111bd

View file

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