diff options
Diffstat (limited to '.config/vdirsyncer/config')
| -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. |