aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authordave <starpumadev@gmail.com>2019-03-29 10:11:28 -0400
committerdave <starpumadev@gmail.com>2019-03-29 10:11:28 -0400
commit783cc00dd0ea24b98bc8442b60c91be387428a7e (patch)
tree216663f5877e9f444009b3b8ef900aa646202d4c /src/lib
parent5fd589d5e717bbcbc46db5efb35878b993b6dfbc (diff)
parent25370083b63328ad489f4f0676a4bfa33de59671 (diff)
merge develop & resolve conflict
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/persisted_state.js3
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")