diff options
| author | David Runge <dave@sleepmap.de> | 2016-09-22 21:16:43 +0200 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2016-09-22 21:16:43 +0200 |
| commit | b658d77cbb5760869f06ab4fc53f32e13d485df0 (patch) | |
| tree | 861860bd7b03cefb0fe8043330ddef55d475d90d /.vdirsyncer/config | |
| parent | 4acd668c06f959458c55bb2ae8d024f8fd1fca72 (diff) | |
| parent | 5b54e44a27b9dadc820402d8c34f382360ccced6 (diff) | |
| download | dotfiles-b658d77cbb5760869f06ab4fc53f32e13d485df0.tar.gz dotfiles-b658d77cbb5760869f06ab4fc53f32e13d485df0.tar.bz2 dotfiles-b658d77cbb5760869f06ab4fc53f32e13d485df0.tar.xz dotfiles-b658d77cbb5760869f06ab4fc53f32e13d485df0.zip | |
Merge branch 'master' of sleepmap.de:config/dotfiles
* 'master' of sleepmap.de:config/dotfiles:
.vdirsyncer/config: Removing/merging unneeded calendars.
Diffstat (limited to '.vdirsyncer/config')
| -rw-r--r-- | .vdirsyncer/config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.vdirsyncer/config b/.vdirsyncer/config index 61e657c..5c12bee 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -42,7 +42,7 @@ password.fetch = ["command", "~/bin/pass2vdirsyncer", "drunge", "www2.ak.tu-berl [pair dave_calendar] a = dave_calendar_local b = dave_calendar_remote -collections = ["akt", "concerts", "contact_birthdays", "courses", "flat", "live", "private", "unix-pool", "work"] +collections = ["concerts", "contact_birthdays", "flat", "private", "work"] [storage dave_calendar_local] type = filesystem @@ -59,7 +59,7 @@ password.fetch = ["command", "~/bin/pass2vdirsyncer", "dave", "cloud.sleepmap.de [pair akt_calendar] 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"] +collections = ["ak_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] |