From 77b3780ab2c58581abfa099d2762775e205ff440 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 2 Oct 2013 15:32:02 +0200 Subject: [PATCH] Do not put the conflict_copies in the ocsync config file. Because owncloud sets it too true programmaticaly, and we don't want to overwrite it with the config --- config/ocsync.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ocsync.conf b/config/ocsync.conf index 6c496a4162..fa537f5e1e 100644 --- a/config/ocsync.conf +++ b/config/ocsync.conf @@ -12,5 +12,5 @@ max_depth = 50 timeout = 30 # create a copy for backup for the file which has a conflict -with_confilct_copies = no +#with_confilct_copies = no