aboutsummaryrefslogtreecommitdiffstats
path: root/.vdirsyncer
diff options
context:
space:
mode:
Diffstat (limited to '.vdirsyncer')
-rw-r--r--.vdirsyncer/config2
1 files changed, 1 insertions, 1 deletions
diff --git a/.vdirsyncer/config b/.vdirsyncer/config
index 23beea9..e8ec980 100644
--- a/.vdirsyncer/config
+++ b/.vdirsyncer/config
@@ -30,7 +30,7 @@ collections = ["akt","bands","private","services","tu-berlin","unixpool", "venue
# `null` - abort when collisions occur (default)
# `"a wins"` - assume a's items to be more up-to-date
# `"b wins"` - assume b's items to be more up-to-date
-#conflict_resolution = null
+conflict_resolution = "b wins"
[storage dave_contacts_local]
# A storage references actual data on a remote server or on the local disk.