aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2020-04-18 20:30:57 +0200
committerDavid Runge <dave@sleepmap.de>2020-04-18 20:30:57 +0200
commit4084e014d3e85a7f7482cf787293ba9171a3c7f7 (patch)
tree1880b71db421bf1c77feedf296d42cbd2b0717de
parente47d43d6ca8901863f7b688ee78b79e97a43b6b5 (diff)
downloaddotfiles-4084e014d3e85a7f7482cf787293ba9171a3c7f7.tar.gz
dotfiles-4084e014d3e85a7f7482cf787293ba9171a3c7f7.tar.bz2
dotfiles-4084e014d3e85a7f7482cf787293ba9171a3c7f7.tar.xz
dotfiles-4084e014d3e85a7f7482cf787293ba9171a3c7f7.zip
Adding conflict resolution for calendars
.vdirsyncer/config: Adding conflict resolution for calendars (b wins).
-rw-r--r--.vdirsyncer/config1
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]