From 56a85d6625e4c92c78750fe54518d4fdd495d36e Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 9 Aug 2016 20:41:27 +0200 Subject: .vdirsyncer/config: Adding 'b wins' conflict_resolution for akt. --- .vdirsyncer/config | 1 + 1 file changed, 1 insertion(+) 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 -- cgit v1.2.3-70-g09d2