From df370b069293ab3f974f4b23e52984386f881450 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 27 Oct 2017 15:32:00 -0500 Subject: [PATCH] Update build_tools.sh --- tools/travis/build_tools.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/travis/build_tools.sh b/tools/travis/build_tools.sh index b3409209af..193ad261a6 100755 --- a/tools/travis/build_tools.sh +++ b/tools/travis/build_tools.sh @@ -7,12 +7,8 @@ if [ "$BUILD_TOOLS" = true ]; then md5sum -c - <<< "49bc6b1b9ed56c83cceb6674bd97cb34 *html/changelogs/example.yml"; cd tgui && source ~/.nvm/nvm.sh && gulp && cd ..; -<<<<<<< HEAD - php5.6 -l tools/WebhookProcessor/github_webhook_processor.php; -======= phpenv global 5.6 php -l tools/WebhookProcessor/github_webhook_processor.php; php -l tools/TGUICompiler.php; ->>>>>>> 9b71dcb... Merge pull request #32050 from optimumtact/ripandtearthehugeguts python tools/ss13_genchangelog.py html/changelog.html html/changelogs; fi;