X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2Frun-tests.sh;h=4d4043044ebaf2d43fb0bc502d1f64fbd48017eb;hb=f957d32ed3ef7c66326f3875fb5f5ce202516342;hp=dd7d26dd34ef324d44643f7f2b515e320f2dc3df;hpb=a2291edac65fe16bf8f158150c7474e1c3480685;p=lyx.git

diff --git a/development/autotests/run-tests.sh b/development/autotests/run-tests.sh
index dd7d26dd34..4d4043044e 100755
--- a/development/autotests/run-tests.sh
+++ b/development/autotests/run-tests.sh
@@ -21,15 +21,13 @@ if [ "$(which wmctrl)" == "" ]; then
     exit -1;
 fi
 
-<<<<<<< Updated upstream
 if [ "$(which pcregrep)" == "" ]; then
     echo "You need to install pcregrep first, try:"
     echo "  sudo apt-get install pcregrep"
     exit -1;
 fi
-=======
+
 PROGRAM_SUFFIX=$(grep -e '#define PACKAGE ' ../../config.h | sed -e 's/#define PACKAGE "lyx\(.*\)"/\1/')
->>>>>>> Stashed changes
 
 export XVKBD_EXE=../$XVKBD_EXE
 export KEYTEST=../keytest.py