From b40cc111bdcadd05bcc67cc7cda6090e3e978ab4 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 15 Aug 2017 15:03:25 +0100 Subject: [PATCH] Remove incidental diff syntax --- src/i18n/strings/en_EN.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 033b932b22..f1356a9c01 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -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 }