diff options
| author | David Runge <dave@sleepmap.de> | 2015-03-03 15:21:57 +0100 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2015-03-03 15:21:57 +0100 |
| commit | 9e1d9c25d66a9735e1bdb15c0720b7911f1cd81b (patch) | |
| tree | 727342d265ad42f69e45397302822b600f4f47ce /.vdirsyncer/config | |
| parent | 8143da66ff5b0d5ac8fb246ac5ebd60d99836bed (diff) | |
| download | dotfiles-9e1d9c25d66a9735e1bdb15c0720b7911f1cd81b.tar.gz dotfiles-9e1d9c25d66a9735e1bdb15c0720b7911f1cd81b.tar.bz2 dotfiles-9e1d9c25d66a9735e1bdb15c0720b7911f1cd81b.tar.xz dotfiles-9e1d9c25d66a9735e1bdb15c0720b7911f1cd81b.zip | |
.vdirsyncer/config: Adding b wins as conflict resolution.
Diffstat (limited to '.vdirsyncer/config')
| -rw-r--r-- | .vdirsyncer/config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.vdirsyncer/config b/.vdirsyncer/config index 23beea9..e8ec980 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -30,7 +30,7 @@ collections = ["akt","bands","private","services","tu-berlin","unixpool", "venue # `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 dave_contacts_local] # A storage references actual data on a remote server or on the local disk. |