--- a/test/bin-test/test-dav-sync.sh Sat Aug 24 23:34:16 2019 +0200 +++ b/test/bin-test/test-dav-sync.sh Sun Aug 25 09:43:12 2019 +0200 @@ -92,7 +92,7 @@ # do_test "dav-sync push (1)" test-dav-sync-push1.sh do_test "dav-sync pull (1)" test-dav-sync-pull1.sh -do_test "dav-sync conflict (1)" test-dav-sync-conflict.sh +do_test "dav-sync conflict (1)" test-dav-sync-pull-conflict.sh # cleanup $DAV_BIN rm dav-test-repo/sync/test1 > /dev/null 2>&1