From 5246c77d86cc775e83f011386ba3110362aaa3ba Mon Sep 17 00:00:00 2001
From: vantezzen <hello@vantezzen.io>
Date: Wed, 26 Feb 2020 09:55:56 +0100
Subject: Fix merge errors

---
 src/i18n/locales/defaultMessages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/i18n/locales')

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index b97a87c2e..075ef34fa 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4184,7 +4184,7 @@
         "id": "settings.app.form.navigationBarBehaviour",
         "start": {
           "column": 26,
-          "line": 57
+          "line": 59
         }
       },
       {
-- 
cgit v1.2.3-70-g09d2