diff options
| author |  vantezzen <hello@vantezzen.io> | 2020-02-26 09:55:56 +0100 |
|---|---|---|
| committer | vantezzen <hello@vantezzen.io> | 2020-02-26 09:55:56 +0100 |
| commit | 5246c77d86cc775e83f011386ba3110362aaa3ba (patch) | |
| tree | 2df0d09b19a5f7fc403db10b02c7a6d4fe009829 /src/stores | |
| parent | Merge branch 'develop' into feat/#270 (diff) | |
| download | ferdium-app-5246c77d86cc775e83f011386ba3110362aaa3ba.tar.gz ferdium-app-5246c77d86cc775e83f011386ba3110362aaa3ba.tar.zst ferdium-app-5246c77d86cc775e83f011386ba3110362aaa3ba.zip | |
Fix merge errors
Diffstat (limited to 'src/stores')
| -rw-r--r-- | src/stores/SettingsStore.js | 2 |
1 files changed, 1 insertions, 1 deletions
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 { | |||
| 250 | }, | 250 | }, |
| 251 | }); | 251 | }); |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | if (!this.all.migration['5.4.4-beta.2-settings']) { | 254 | if (!this.all.migration['5.4.4-beta.2-settings']) { |
| 255 | const { | 255 | const { |
| 256 | showServiceNavigationBar, | 256 | showServiceNavigationBar, |