# HG changeset patch
# User Robert Jack <robert.h.jack@gmail.com>
# Date 1466436427 -3600
# Node ID 67c45feec3c35cdcc19fe64038f52ff4292bb8b5
# Parent  8fcfbfb32aa044579a6293da67b3e9dd33234b70
And again.

diff -r 8fcfbfb32aa0 -r 67c45feec3c3 scripts/build_project.sh
--- a/scripts/build_project.sh	Mon Jun 20 16:20:38 2016 +0100
+++ b/scripts/build_project.sh	Mon Jun 20 16:27:07 2016 +0100
@@ -5,19 +5,6 @@
 # The source files in this directory are copied to the board and compiled.
 
 # set defaults unless variables are already set
-<<<<<<< mine
-[ -z "$BBB_ADDRESS" ] && BBB_ADDRESS="root@192.168.7.2"
-[ -z "$BBB_BELA_HOME" ] && BBB_BELA_HOME="~/Bela/"
-[ -z "$BBB_SCREEN_NAME" ] && BBB_SCREEN_NAME="Bela"
-[ -z "$RUN_PROJECT" ] && RUN_PROJECT=1
-[ -z "$COMMAND_ARGS" ] && COMMAND_ARGS=
-[ -z "$RUN_IN_FOREGROUND" ] && RUN_IN_FOREGROUND=1
-[ -z "$RUN_WITHOUT_SCREEN" ] && RUN_WITHOUT_SCREEN=0
-[ -z "$BBB_PROJECT_HOME" ] && BBB_PROJECT_HOME="${BBB_BELA_HOME}/projects/"
-[ -z "$BBB_DEFAULT_PROJECT_NAME" ] && BBB_DEFAULT_PROJECT_NAME="scriptUploadedProject"
-[ -z "$BBB_PROJECT_NAME" ] && BBB_PROJECT_NAME=$BBB_DEFAULT_PROJECT_NAME
-=======
->>>>>>> theirs
 
 SCRIPTDIR=$(dirname "$0")
 [ -z $SCRIPTDIR ] && SCRIPTDIR="./" || SCRIPTDIR=$SCRIPTDIR/