diff options
| author | ps-george <george.punter15@imperial.ac.uk> | 2018-03-07 12:01:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-07 12:01:47 +0000 |
| commit | 7890913ea4401a591abf48f827eb2c6e675c7626 (patch) | |
| tree | e6ea6c97ddbdf7730fb2fe59aae0441e04a935ba /build.sh | |
| parent | 276decea174c394e8939068818d49c2c2d488b9e (diff) | |
| download | FMark-7890913ea4401a591abf48f827eb2c6e675c7626.tar.gz FMark-7890913ea4401a591abf48f827eb2c6e675c7626.zip | |
merge tags
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -36,11 +36,8 @@ if [[ -z $TRAVIS_BUILD_DIR ]]; then cd $BASE_DIR/FMark/src/FMarkFable dotnet restore dotnet fable yarn-dev -<<<<<<< HEAD read -n1 -r -p "Press any key to continue..." key if [[ "$?" != "0" ]]; then exit 1 fi -======= ->>>>>>> f9d4f3b8dee743cfc106565b9da05b2d031fdb02 fi |