Permalink
Browse files

add support for the conflict copy feature available on csync git

  • Loading branch information...
Duncan Mac-Vicar P
Duncan Mac-Vicar P committed Sep 13, 2011
1 parent 7f8d1b6 commit 87ac6cae2b3ff795c91ceca90f04661d9511f32a
Showing with 5 additions and 0 deletions.
  1. +5 −0 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;

0 comments on commit 87ac6ca

Please sign in to comment.