diff options
Diffstat (limited to 'src/main.js')
| -rw-r--r-- | src/main.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.js b/src/main.js index 9f094ada..5f459d46 100644 --- a/src/main.js +++ b/src/main.js @@ -43,6 +43,7 @@ const i18n = new VueI18n({ messages }) +======= const persistedStateOptions = { paths: [ 'config', @@ -66,6 +67,7 @@ createPersistedState(persistedStateOptions).then((persistedState) => { plugins: [persistedState], strict: false // Socket modifies itself, let's ignore this for now. // strict: process.env.NODE_ENV !== 'production' +>>>>>>> upstream/develop }) afterStoreSetup({store, i18n}) |