Quellcode durchsuchen

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
Olivier Goffart vor 12 Jahren
Ursprung
Commit
77b3780ab2
1 geänderte Dateien mit 1 neuen und 1 gelöschten Zeilen
  1. 1 1
      config/ocsync.conf

+ 1 - 1
config/ocsync.conf

@@ -12,5 +12,5 @@ max_depth = 50
 timeout = 30
 timeout = 30
 
 
 # create a copy for backup for the file which has a conflict
 # create a copy for backup for the file which has a conflict
-with_confilct_copies = no
+#with_confilct_copies = no