diff options
| author | luxagraf <sng@luxagraf.net> | 2022-11-29 17:04:27 -0600 |
|---|---|---|
| committer | luxagraf <sng@luxagraf.net> | 2022-11-29 17:04:27 -0600 |
| commit | bca68ebf2db96a255b734b94a61f6c04fdee2d5e (patch) | |
| tree | 16192a6031561fc551d9da61c688f43c45485d4c /.config/vdirsyncer | |
| parent | 033d3f11db8f7afcd8a6ae202b097b5d931ec052 (diff) | |
latest sway changes from HP
Diffstat (limited to '.config/vdirsyncer')
| -rw-r--r-- | .config/vdirsyncer/config | 2 |
1 files changed, 1 insertions, 1 deletions
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. |