X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=cal%2F.config%2Fvdirsyncer%2Fconfig;h=155fa6d3e1d947b911b5911a7803e8cda05db90b;hb=07dc43a8049adad53113b2244f8c94dbeb487b74;hp=0bb3a6910ba6eeb15fc352806fd8f868ff8cbd87;hpb=6228817eca37fd92348d47e0de2ebb3221c0de1e;p=dotfiles.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index 0bb3a69..155fa6d 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -15,8 +15,8 @@ status_path = ~/.vdirsyncer/status/
 [pair contacts]
 a = contacts_local
 b = contacts_remote
-
-collections = ["from b"]
+conflict_resolution = a wins
+collections = ["default"]
 
 [storage contacts_local]
 type = filesystem
@@ -34,6 +34,7 @@ password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 [pair calendar]
 a = calendar_local
 b = calendar_remote
+conflict_resolution = a wins
 collections = ["default", "mart", "elvira", "vuilnis"]
 
 [storage calendar_local]