From e43975898e0258ee055ca9b5da2ac2678d797f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Thu, 31 Aug 2023 14:09:37 -0300
Subject: [PATCH] vdir: fix conflicts

---
 user/vdir.nix | 1 +
 1 file changed, 1 insertion(+)

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"