diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-09-28 12:44:09 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-09-28 12:44:09 +0200 |
| commit | 1d47e704b1db4abe38c8f4ccdaed7474a972a2a8 (patch) | |
| tree | 6b104504799cb009c79e0472b15b802df7b77923 /src/models | |
| parent | 2f63616f5d43253f491e77ecdb7dabcbf220367f (diff) | |
Conflict management
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'src/models')
| -rw-r--r-- | src/models/contact.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/models/contact.js b/src/models/contact.js index 3836d91d..feed1a51 100644 --- a/src/models/contact.js +++ b/src/models/contact.js @@ -48,6 +48,7 @@ export default class Contact { this.addressbook = addressbook this.vCard = new ICAL.Component(this.jCal) this.url = url + this.conflict = false // if no uid set, create one if (!this.vCard.hasProperty('uid')) { |