X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=cal%2F.config%2Fvdirsyncer%2Fconfig;h=8b360183bcd3b0c7fa2699de5c42f49d5bc3ff01;hb=99b571fbd2d560c26b428c1f2777d74b41d8616d;hp=bada49b955c6c5cc8aef78aa270c3128579e8a82;hpb=47009246a78487eb3fbd708141cdbf101e1d5e4a;p=dotfiles.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index bada49b..8b36018 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -17,6 +17,7 @@ status_path = "~/.vdirsyncer/status/"
 a = "contacts_local"
 b = "contacts_remote"
 collections = ["from b"]
+conflict_resolution = "b wins"
 
 [storage contacts_local]
 type = "filesystem"
@@ -35,6 +36,7 @@ password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 a = "calendar_local"
 b = "calendar_remote"
 collections = ["from b"]
+conflict_resolution = "b wins"
 
 [storage calendar_local]
 type = "filesystem"