From 36b62967910c2db654348263622b88e2564b2dad Mon Sep 17 00:00:00 2001
From: Tommaso Cucinotta <tommaso@lyx.org>
Date: Wed, 13 Nov 2013 20:07:53 +0000
Subject: [PATCH] Fixing previous mess with git stash (apologies).

---
 development/autotests/run-tests.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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
-- 
2.39.2