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 | |
| 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
| -rw-r--r-- | src/i18n/locales/defaultMessages.json | 2 | ||||
| -rw-r--r-- | src/stores/SettingsStore.js | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ | |||
| 4184 | "id": "settings.app.form.navigationBarBehaviour", | 4184 | "id": "settings.app.form.navigationBarBehaviour", |
| 4185 | "start": { | 4185 | "start": { |
| 4186 | "column": 26, | 4186 | "column": 26, |
| 4187 | "line": 57 | 4187 | "line": 59 |
| 4188 | } | 4188 | } |
| 4189 | }, | 4189 | }, |
| 4190 | { | 4190 | { |
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, |