From bca68ebf2db96a255b734b94a61f6c04fdee2d5e Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Tue, 29 Nov 2022 17:04:27 -0600
Subject: latest sway changes from HP

---
 .config/vdirsyncer/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.config/vdirsyncer')

diff --git a/.config/vdirsyncer/config b/.config/vdirsyncer/config
index 930dbc3..3077026 100644
--- a/.config/vdirsyncer/config
+++ b/.config/vdirsyncer/config
@@ -32,7 +32,7 @@ metadata = ["displayname"]
 #   `null` - abort when collisions occur (default)
 #   `"a wins"` - assume a's items to be more up-to-date
 #   `"b wins"` - assume b's items to be more up-to-date
-#conflict_resolution = null
+conflict_resolution = "b wins"
 
 [storage lxf_contacts_local]
 # A storage references actual data on a remote server or on the local disk.
-- 
cgit v1.2.3-70-g09d2