Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

add support for the conflict copy feature available on csync git

  • Loading branch information...
commit 87ac6cae2b3ff795c91ceca90f04661d9511f32a 1 parent 7f8d1b6
Duncan Mac-Vicar P authored
Showing with 5 additions and 0 deletions.
  1. +5 −0 src/mirall/csyncfolder.cpp
View
5 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;
Please sign in to comment.
Something went wrong with that request. Please try again.