Set default LOG_CONFLICTS=false, fixes #181

sync.conf.example

@@ -138,7 +138,7 @@ MAX_WAIT=7200
 [BACKUP_DELETE_OPTIONS]
 
 ## Log a list of conflictual files (EXPERIMENTAL)
-LOG_CONFLICTS=true
+LOG_CONFLICTS=false
 ## Send an email when conflictual files are found (implies LOG_CONFLICTS)
 ALERT_CONFLICTS=false
 ## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups

upgrade-v1.0x-v1.3x.sh

@@ -7,7 +7,7 @@ CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
 OLD_PROGRAM_VERSION="v1.0x-v1.2x"
 NEW_PROGRAM_VERSION="v1.3x"
 CONFIG_FILE_REVISION=1.3.0
-PROGRAM_BUILD=2019122501
+PROGRAM_BUILD=2020011001
 
 ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
 if ! type "$BASH" > /dev/null; then
@@ -135,7 +135,7 @@ true
 1801
 60
 7200
-true
+false
 false
 true
 false