vdir: fix conflicts
This commit is contained in:
parent
75064dafd4
commit
e43975898e
|
@ -54,6 +54,7 @@ in
|
||||||
b = "calendar_remote"
|
b = "calendar_remote"
|
||||||
collections = ["from a", "from b"]
|
collections = ["from a", "from b"]
|
||||||
metadata = ["displayname", "color"]
|
metadata = ["displayname", "color"]
|
||||||
|
conflict_resolution = "b wins"
|
||||||
|
|
||||||
[storage calendar_local]
|
[storage calendar_local]
|
||||||
type = "filesystem"
|
type = "filesystem"
|
||||||
|
|
Loading…
Reference in a new issue