diff options
Diffstat (limited to '.vdirsyncer')
| -rw-r--r-- | .vdirsyncer/config | 1 |
1 files changed, 1 insertions, 0 deletions
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] |