From 2b05dc33b727c9e7b23762bdf2147fffec5d1ecc Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 22 Feb 2012 17:52:19 +0100
Subject: [PATCH] client: Disable conflict copies by default.

---
 client/csync_client.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/csync_client.c b/client/csync_client.c
index 000db019f..2a0d7aab0 100644
--- a/client/csync_client.c
+++ b/client/csync_client.c
@@ -187,6 +187,7 @@ int main(int argc, char **argv) {
   arguments.update = 1;
   arguments.reconcile = 1;
   arguments.propagate = 1;
+  arguments.with_conflict_copys = false;
 
   /*
    * Parse our arguments; every option seen by parse_opt will