diff options
| author | Henry Jameson <me@hjkos.com> | 2018-11-26 04:44:54 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-11-26 04:44:54 +0300 |
| commit | b948234aec2ec1d140a46303c09d24424262bd66 (patch) | |
| tree | 42b479fa25d0fe4c39401f9759e2f35323f86b61 /src/main.js | |
| parent | 2dbc5f757d4e84e210a45ea99a64b79df6778b77 (diff) | |
whoops
Diffstat (limited to 'src/main.js')
| -rw-r--r-- | src/main.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main.js b/src/main.js index 5f459d46..9f094ada 100644 --- a/src/main.js +++ b/src/main.js @@ -43,7 +43,6 @@ const i18n = new VueI18n({ messages }) -======= const persistedStateOptions = { paths: [ 'config', @@ -67,7 +66,6 @@ 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}) |