rudefox/burrow-pi-img
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a missing merge conflict

Browse Source
This commit is contained in:
Charles Cross 2016-05-05 15:33:53 -07:00
parent 892ae48cca
commit 766837b833
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -237,12 +237,8 @@ export IMG_NAME
export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export SCRIPT_DIR="${BASE_DIR}/scripts"
<<<<<<< HEAD
export WORK_DIR="${BASE_DIR}/work/${IMG_NAME}"
=======
export WORK_DIR="${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"
export DEPLOY_DIR="${BASE_DIR}/deploy"
>>>>>>> bdca3e3b48e72df796ec7b1a24a26c08b2dcfa67
export LOG_FILE="${WORK_DIR}/build.log"
export CLEAN