add support for the conflict copy feature available on csync git

dmacvicar · Sep 13, 2011 · 87ac6ca · 87ac6ca
1 parent 7f8d1b6
commit 87ac6ca
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/mirall/csyncfolder.cpp b/src/mirall/csyncfolder.cpp
@@ -57,7 +57,12 @@ void CSyncThread::run()
     if (error())
         return;
 
+#if LIBCSYNC_VERSION_INT >= CSYNC_VERSION_INT(0, 45, 0)
+    csync_enable_conflictcopys(csync);
+#endif
+
     _error = csync_init(csync);
+
     if (error())
         goto cleanup;