From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 26 Dec 2012 16:15:32 +0000 (+0100)
Subject: Fix typo in all-disk-tests
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=97ed7490dbe67e8127a6433e0f229402e16d9ced;p=bacula%2Fbacula

Fix typo in all-disk-tests
---

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