repositories
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small update
[dotfiles.git]
/
cal
/
.config
/
vdirsyncer
/
config
diff --git
a/cal/.config/vdirsyncer/config
b/cal/.config/vdirsyncer/config
index
0bb3a69
..
155fa6d
100644
(file)
--- a/
cal/.config/vdirsyncer/config
+++ b/
cal/.config/vdirsyncer/config
@@
-15,8
+15,8
@@
status_path = ~/.vdirsyncer/status/
[pair contacts]
a = contacts_local
b = contacts_remote
[pair contacts]
a = contacts_local
b = contacts_remote
-
-collections = ["
from b
"]
+conflict_resolution = a wins
+collections = ["
default
"]
[storage contacts_local]
type = filesystem
[storage contacts_local]
type = filesystem
@@
-34,6
+34,7
@@
password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
[pair calendar]
a = calendar_local
b = calendar_remote
[pair calendar]
a = calendar_local
b = calendar_remote
+conflict_resolution = a wins
collections = ["default", "mart", "elvira", "vuilnis"]
[storage calendar_local]
collections = ["default", "mart", "elvira", "vuilnis"]
[storage calendar_local]