From dbab0ab340880bba7103ba534b824721546299e1 Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Mon, 30 Jan 2012 14:24:08 +0100
Subject: ssl options to fbgui

---
 testApp.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'testApp.sh')

diff --git a/testApp.sh b/testApp.sh
index 132208c..7c85ae4 100755
--- a/testApp.sh
+++ b/testApp.sh
@@ -11,13 +11,10 @@
 #               -s <path>,  --serial=<path>   sets path to serial number file
 #
 # Note: all path are expected to be absolute.
-<<<<<<< HEAD
-QT_VERSION=Qt-4.8.0
-=======
 # 
 # Adapt these to your own system.
-QT_VERSION=Qt-4.7.2
-PATH_TO_FBGUI_BUILD=/home/joe/workspace/fbgui
+QT_VERSION=Qt-4.8.0
+PATH_TO_FBGUI_BUILD=/home/michael/workspace/fbgui
 
 # check if network discovery is activated and if running as root
 for ARG in $*
@@ -29,7 +26,6 @@ if [ "x$ARG" = "x-n" ]; then
   fi
 fi
 done
->>>>>>> 2abf1cec73371fb4a97a078a47f521d23fbf0775
 
 # clean /tmp/fbgui
 [ -d /tmp/fbgui ] && rm -rf /tmp/fbgui
@@ -50,10 +46,6 @@ display_id=$(grep -n $(whoami) /etc/passwd| head -n 1|awk -F : '{print $1}')
 # quick sleep to wait for qvfb loading
 sleep 0.2
 # Start fbgui connecting to QVFb with display_id from above.
-<<<<<<< HEAD
-$working_path/../workspace/fbgui/src/fbgui/fbgui -display QVFb:$display_id $@
-=======
 $PATH_TO_FBGUI_BUILD/src/fbgui/fbgui -display QVFb:$display_id $@ -e $PATH_TO_FBGUI_BUILD/src/customdhcpcd/cdhcpcd
->>>>>>> 2abf1cec73371fb4a97a078a47f521d23fbf0775
 # kill qvfb since fbgui stopped
 killall qvfb
-- 
cgit v1.2.3-55-g7522