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 +-
 src/stores/SettingsStore.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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
         }
       },
       {
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 45c2cbd50..43f00b723 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -250,7 +250,7 @@ export default class SettingsStore extends Store {
         },
       });
     }
-    
+
     if (!this.all.migration['5.4.4-beta.2-settings']) {
       const {
         showServiceNavigationBar,
-- 
cgit v1.2.3-70-g09d2