2 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 12331fb..ee34bb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ Debug
 /doxygen/html/*
 /doxygen/latex/*
 /doxygen/man/*
+testApp.sh
diff --git a/testApp.sh b/testApp.sh
index d9a02b3..132208c 100755
--- a/testApp.sh
+++ b/testApp.sh
@@ -11,6 +11,9 @@
 #               -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
@@ -26,6 +29,7 @@ if [ "x$ARG" = "x-n" ]; then
   fi
 fi
 done
+>>>>>>> 2abf1cec73371fb4a97a078a47f521d23fbf0775
 
 # clean /tmp/fbgui
 [ -d /tmp/fbgui ] && rm -rf /tmp/fbgui
@@ -46,6 +50,10 @@ 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