lib/unicodesymbols tests and fixes: Block Miscellaneous Symbols.

[lyx.git] / development / autotests / run-tests.sh

diff --git a/development/autotests/run-tests.sh b/development/autotests/run-tests.sh
index dd7d26dd34ef324d44643f7f2b515e320f2dc3df..4d4043044ebaf2d43fb0bc502d1f64fbd48017eb 100755 (executable)
--- 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