X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fall-disk-tests;h=50802ce358c651d8b0e47e624300a0d4843a4ec9;hb=97ed7490dbe67e8127a6433e0f229402e16d9ced;hp=6bbdb6274373c307c2b7fc0beb5bd66c276d8c78;hpb=6a88198d1f5f0e6b5d120e258efd1a3ef9cc2544;p=bacula%2Fbacula

diff --git a/regress/all-disk-tests b/regress/all-disk-tests
index 6bbdb62743..50802ce358 100755
--- a/regress/all-disk-tests
+++ b/regress/all-disk-tests
@@ -7,7 +7,6 @@ echo " " >>test.out
 echo "Start non-root disk tests"
 echo "Start non-root disk tests" >>test.out
 rm -f dumps/*
-<<<<<<< HEAD
 ./run tests/acl-xattr-test
 ./run tests/action-on-purge-test
 ./run tests/allowcompress-test
@@ -63,7 +62,7 @@ rm -f dumps/*
 ./run tests/restore2-by-file-test
 ./run tests/restore-by-file-test
 ./run tests/restore-disk-seek-test
-./run tests/./runscript-test
+./run tests/runscript-test
 ./run tests/source-addr-test
 ./run tests/stats-test
 ./run tests/six-vol-test