From 4084e014d3e85a7f7482cf787293ba9171a3c7f7 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sat, 18 Apr 2020 20:30:57 +0200 Subject: Adding conflict resolution for calendars .vdirsyncer/config: Adding conflict resolution for calendars (b wins). --- .vdirsyncer/config | 1 + 1 file changed, 1 insertion(+) (limited to '.vdirsyncer/config') diff --git a/.vdirsyncer/config b/.vdirsyncer/config index 39926ab..1aa88a1 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -23,6 +23,7 @@ password.fetch = ["command", "~/bin/pass2vdirsyncer", "dave", "cloud.sleepmap.de [pair dave_calendar] a = "dave_calendar_local" b = "dave_calendar_remote" +conflict_resolution = "b wins" collections = ["concerts", "contact_birthdays", "live", "flat", "private", "work", "bus_shared_by_t4", "personal_shared_by_nanni"] [storage dave_calendar_local] -- cgit v1.2.3-70-g09d2