From a7ceea1dacbe344b0bde00abbde5502ebeb1e7fe Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 30 May 2017 15:00:05 +0200 Subject: [PATCH] WIP: conflict list --- dev/n_osync.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/n_osync.sh b/dev/n_osync.sh index e7ae3f4..2b73efe 100755 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2017 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.2.2-dev -PROGRAM_BUILD=2017053005 +PROGRAM_BUILD=2017053006 IS_STABLE=no @@ -2139,9 +2139,9 @@ function Init { readonly __deletedListFile=13 readonly __failedDeletedListFile=14 readonly __successDeletedListFile=15 - readonly __timestampCurrentFile=15 - readonly __timestampPreviousFile=16 - readonly __conflictListFile=17 + readonly __timestampCurrentFile=16 + readonly __timestampPreviousFile=17 + readonly __conflictListFile=18 INITIATOR=() INITIATOR[$__type]='initiator'