From 61f7ebe1565f36a548f485888ed76c3568f37e33 Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 2 Jul 2018 15:44:27 +0200 Subject: [PATCH] WIP: no conflictDetection tests while working on it --- dev/tests/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index ec50847..20f0757 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -1091,7 +1091,7 @@ function nope_test_Locking () { SetConfFileValue "$CONF_DIR/$REMOTE_CONF" "FORCE_STRANGER_LOCK_RESUME" "no" } -function test_ConflictDetetion () { +function nope_test_ConflictDetetion () { local result # Tests compatible with v1.3+