diff options
| author | David Runge <dave@sleepmap.de> | 2016-08-09 20:41:27 +0200 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2016-08-09 20:41:27 +0200 |
| commit | 56a85d6625e4c92c78750fe54518d4fdd495d36e (patch) | |
| tree | 6e28a0ca8c9269f58d04355728f4c1579ff87277 /.vdirsyncer/config | |
| parent | ce8b427db092c3a1d2c7b77453a74fe061295292 (diff) | |
| download | dotfiles-56a85d6625e4c92c78750fe54518d4fdd495d36e.tar.gz dotfiles-56a85d6625e4c92c78750fe54518d4fdd495d36e.tar.bz2 dotfiles-56a85d6625e4c92c78750fe54518d4fdd495d36e.tar.xz dotfiles-56a85d6625e4c92c78750fe54518d4fdd495d36e.zip | |
.vdirsyncer/config: Adding 'b wins' conflict_resolution for akt.
Diffstat (limited to '.vdirsyncer/config')
| -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 |