diff --git a/user/vdir.nix b/user/vdir.nix index ab5d2de..61170df 100644 --- 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"