vdir: fix conflicts

2023-08-31 14:09:37 -03:00 · 2023-08-31 14:09:37 -03:00 · e43975898e
commit e43975898e
parent 75064dafd4
1 changed files with 1 additions and 0 deletions
--- a/user/vdir.nix
+++ b/user/vdir.nix
@ -54,6 +54,7 @@ in
      b = "calendar_remote"
      collections = ["from a", "from b"]
      metadata = ["displayname", "color"]
+      conflict_resolution = "b wins"

      [storage calendar_local]
      type = "filesystem"