Update build_tools.sh

2017-10-27 15:32:00 -05:00
parent 23af6f7f52
commit df370b0692
1 changed files with 0 additions and 4 deletions
@@ -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;