diff options
Diffstat (limited to 'src/store/addressbooks.js')
| -rw-r--r-- | src/store/addressbooks.js | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/store/addressbooks.js b/src/store/addressbooks.js index 062351c0..1dad9c28 100644 --- a/src/store/addressbooks.js +++ b/src/store/addressbooks.js @@ -192,13 +192,8 @@ const actions = { * @param {Object} context * @param {Object} importDetails = { vcf, addressbook } */ -<<<<<<< HEAD getContactsFromAddressBook(context, { vcf, addressbook }) { let contacts = parseVcf(vcf, addressbook) -======= - getContactsFromAddressBook(context, { vcf, addressbook, importState }) { - let contacts = parseVcf(vcf, addressbook, importState) ->>>>>>> 699af87659b724df00df77da2c9b66ec9013c2d6 context.commit('appendContactsToAddressbook', { addressbook, contacts }) context.commit('appendContacts', contacts) context.commit('sortContacts') |