diff options
| author | suntala <suntala@hotmail.com> | 2018-08-29 15:55:33 +0200 |
|---|---|---|
| committer | suntala <suntala@hotmail.com> | 2018-08-29 16:02:02 +0200 |
| commit | 842dad32d9e8e2dc5a70d4a8869b9f9a2bfec7cc (patch) | |
| tree | 967e8eff9651cd2ce4cd5ab570739c78313777a0 /src/services | |
| parent | a65f35305bbd55a9f9a6759e57fa1fc317883a35 (diff) | |
Merge conflict resolution.
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/parseVcf.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/services/parseVcf.js b/src/services/parseVcf.js index 66aca511..36797982 100644 --- a/src/services/parseVcf.js +++ b/src/services/parseVcf.js @@ -23,7 +23,7 @@ import Contact from '../models/contact' import Store from '../store/index' -export default function parseVcf(data = '', addressbook, importState) { +export default function parseVcf(data = '', addressbook) { let regexp = /BEGIN:VCARD[\s\S]*?END:VCARD/mgi let vCards = data.match(regexp) let importState = Store.getters.getImportState |