diff options
| author | dave <starpumadev@gmail.com> | 2019-03-27 16:41:05 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-27 16:41:05 -0400 |
| commit | 30084a120470b6220f684ebaed1a196e68ba8188 (patch) | |
| tree | 3bef78d0a87c03df813d5910aca6a16af76ba61d /src/lib | |
| parent | 578b412177495af4376dbcbcbeac85bc6cb99432 (diff) | |
| parent | aed0943678ffb96df0c281a7edbba63aaa6578e8 (diff) | |
merge develop and resolve conflict
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/persisted_state.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js index 720ff706..7ab89c12 100644 --- a/src/lib/persisted_state.js +++ b/src/lib/persisted_state.js @@ -60,9 +60,6 @@ export default function createPersistedState ({ merge({}, store.state, savedState) ) } - if (store.state.oauth.token) { - store.dispatch('loginUser', store.state.oauth.token) - } loaded = true } catch (e) { console.log("Couldn't load state") |