diff options
Diffstat (limited to 'src/store/importState.js')
| -rw-r--r-- | src/store/importState.js | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/store/importState.js b/src/store/importState.js index 4b85085c..4e387ab6 100644 --- a/src/store/importState.js +++ b/src/store/importState.js @@ -24,18 +24,13 @@ const state = { importState: { total: 0, accepted: 0, -<<<<<<< HEAD denied: 0, stage: 'default', addressbook: '' -======= - denied: 0 ->>>>>>> 699af87659b724df00df77da2c9b66ec9013c2d6 } } const mutations = { -<<<<<<< HEAD /** * Increment the number of contacts accepted * @@ -83,8 +78,6 @@ const mutations = { changeStage(state, stage) { state.importState.stage = stage } -======= ->>>>>>> 699af87659b724df00df77da2c9b66ec9013c2d6 } const getters = { @@ -92,7 +85,6 @@ const getters = { } const actions = { -<<<<<<< HEAD /** * Increment the number of contacts accepted * @@ -140,8 +132,6 @@ const actions = { changeStage(context, stage) { context.commit('changeStage', stage) } -======= ->>>>>>> 699af87659b724df00df77da2c9b66ec9013c2d6 } export default { state, mutations, getters, actions } |