1 files changed, 25 insertions, 0 deletions
diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-conflict.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-conflict.vcf
new file mode 100644
index 00000000..5103a601
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-conflict.vcf
@@ -0,0 +1,25 @@
+BEGIN:VCARD
+VERSION:3.0
+URL:
+TITLE:
+ROLE:
+X-EVOLUTION-MANAGER:
+X-EVOLUTION-ASSISTANT:
+NICKNAME:
+X-EVOLUTION-SPOUSE:
+NOTE:
+FN:evo2name
+N:;evo2name;;;
+X-EVOLUTION-FILE-AS:2-conflict
+X-EVOLUTION-BLOG-URL:
+CALURI:
+FBURL:
+X-EVOLUTION-VIDEO-URL:
+X-MOZILLA-HTML:FALSE
+EMAIL;TYPE=WORK;X-EVOLUTION-UI-SLOT=1:samemail
+TEL;TYPE=WORK;TYPE=VOICE;X-EVOLUTION-UI-SLOT=1:samephone
+TEL;TYPE=HOME;TYPE=VOICE;X-EVOLUTION-UI-SLOT=2:samephone2
+ADR;TYPE=HOME:;;sameaddress;;;;
+LABEL;TYPE=HOME:sameaddress
+UID:pas-id-4220B5C300000008
+END:VCARD
+\ No newline at end of file