Remove incidental diff syntax
This commit is contained in:
@@ -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
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user