summaryrefslogtreecommitdiffstats
path: root/src/models
diff options
context:
space:
mode:
authorJessica <jessica@Absolventas-MacBook-Pro.local>2018-09-28 15:20:18 +0200
committerJessica <jessica@Absolventas-MacBook-Pro.local>2018-09-28 15:20:18 +0200
commit531773f7ea78fda29825415725db8fcd8f9f09ec (patch)
treeb2c2bda3f626e6950ed82d8e7e68bf1a4da27e71 /src/models
parent39a872acbaf30f66eb8aadb5114649d0231f4d99 (diff)
parent1d47e704b1db4abe38c8f4ccdaed7474a972a2a8 (diff)
Merge remote-tracking branch 'origin/vue' into vue-avatar-management
Diffstat (limited to 'src/models')
-rw-r--r--src/models/contact.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/models/contact.js b/src/models/contact.js
index 95a20ca2..8854f8ff 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')) {