From 5118054fa35818e6ce2b52233aa54615ca96cb4d Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Sun, 5 May 2013 10:49:48 +0200
Subject: [PATCH] Enable the backup of conflicts files in owncloudcmd

---
 src/owncloudcmd/owncloudcmd.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/owncloudcmd/owncloudcmd.cpp b/src/owncloudcmd/owncloudcmd.cpp
index 6492fe0f9..b8b30b1d3 100644
--- a/src/owncloudcmd/owncloudcmd.cpp
+++ b/src/owncloudcmd/owncloudcmd.cpp
@@ -97,6 +97,7 @@ int main(int argc, char **argv) {
 
     //csync_set_log_callback(   _csync_ctx, csyncLogCatcher );
     csync_set_log_verbosity(_csync_ctx, 11);
+    csync_enable_conflictcopys(_csync_ctx);
 
 
     csync_set_auth_callback( _csync_ctx, getauth );