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/stores/SettingsStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/stores')

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-54-g00ecf