From 9e1d9c25d66a9735e1bdb15c0720b7911f1cd81b Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 3 Mar 2015 15:21:57 +0100 Subject: .vdirsyncer/config: Adding b wins as conflict resolution. --- .vdirsyncer/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.vdirsyncer') 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. -- cgit v1.2.3-54-g00ecf