repositories
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update module
[dotfiles.git]
/
cal
/
.config
/
vdirsyncer
/
config
diff --git
a/cal/.config/vdirsyncer/config
b/cal/.config/vdirsyncer/config
index
bada49b
..
8b36018
100644
(file)
--- a/
cal/.config/vdirsyncer/config
+++ b/
cal/.config/vdirsyncer/config
@@
-17,6
+17,7
@@
status_path = "~/.vdirsyncer/status/"
a = "contacts_local"
b = "contacts_remote"
collections = ["from b"]
a = "contacts_local"
b = "contacts_remote"
collections = ["from b"]
+conflict_resolution = "b wins"
[storage contacts_local]
type = "filesystem"
[storage contacts_local]
type = "filesystem"
@@
-35,6
+36,7
@@
password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
a = "calendar_local"
b = "calendar_remote"
collections = ["from b"]
a = "calendar_local"
b = "calendar_remote"
collections = ["from b"]
+conflict_resolution = "b wins"
[storage calendar_local]
type = "filesystem"
[storage calendar_local]
type = "filesystem"