diff options
-rw-r--r-- | .vdirsyncer/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.vdirsyncer/config b/.vdirsyncer/config index f506d79..c183b0a 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -60,6 +60,7 @@ password.fetch = ["command", "~/bin/pass2vdirsyncer", "dave", "cloud.sleepmap.de a = akt_calendar_local b = akt_calendar_remote collections = ["ak_shared_by_mvoigt", "rechencluster_shared_by_mvoigt", "labs_shared_by_mvoigt", "akurlaub_shared_by_mvoigt", "grossesstudio_shared_by_mvoigt", "kleinesstudio_shared_by_mvoigt", "studioausleihe_shared_by_mvoigt", "studiotermine_shared_by_mvoigt"] +conflict_resolution = "b wins" [storage akt_calendar_local] type = filesystem |