Temporarily disable merge test

This commit is contained in:
Orsiris de Jong 2023-06-14 11:25:12 +02:00
parent 9ade468ed8
commit edfc292486
1 changed files with 3 additions and 3 deletions

View File

@ -200,9 +200,9 @@ function PrepareLocalDirs () {
function oneTimeSetUp () {
START_TIME=$SECONDS
echo "Running forced merge"
cd "${DEV_DIR}"
$SUDO_CMD ./merge.sh osync
#echo "Running forced merge"
#cd "${DEV_DIR}"
#$SUDO_CMD ./merge.sh osync
echo "Setting security for files"
$SUDO_CMD find ${OSYNC_DIR} -exec chmod 755 {} \+