tests: fix unresolved merge conflict

* t/parallel-tests-recheck-pr11791.sh: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/t/parallel-tests-recheck-pr11791.sh b/t/parallel-tests-recheck-pr11791.sh
index efdea8af6b8eace55c8a22bea8cc11377865eeb3..139bc56db1dfce0838a09d954853371f03e488e4 100644 (file)
--- a/t/parallel-tests-recheck-pr11791.sh
+++ b/t/parallel-tests-recheck-pr11791.sh
@@ -56,14 +56,7 @@ $EGREP '(X?PASS|X?FAIL|SKIP|ERROR):' stdout && exit 1
 test -f foo.log
 test -f foo.trs
 
-<<<<<<< HEAD
 run_make -O -e FAIL -- recheck -k
-=======
-using_gmake || $sleep # Required by BSD make.
-run_make -O -e IGNORE -- -k recheck
-# Don't trust the exit status of "make -k" for non-GNU makes.
-! using_gmake || test $am_make_rc -gt 0 || exit 1
->>>>>>> master
 # We don't get a change to run the testsuite.
 $EGREP '(X?PASS|X?FAIL|SKIP|ERROR):' stdout && exit 1
 test -f foo.log