mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-12 06:25:32 +00:00
Code Issues Projects Releases Wiki Activity

bootstrap: fix merge error introduced by cb76f8a5dfba79857ecfd71d2953b759a03671e7

Browse Source 
this error is harmless since it points to a deprecated function, but it showed up as conflicted in master merge.
This commit is contained in:
Dylan K. Taylor 2019-11-29 12:03:07 +00:00
parent 3e4e0d51df
commit 4cfceeeb8e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/PocketMine.php
View File

@ -190,7 +190,7 @@ namespace pocketmine {
if(\Phar::running(true) === ""){ if(\Phar::running(true) === ""){
if(Process::execute("git rev-parse HEAD", $out) === 0 and $out !== false and strlen($out = trim($out)) === 40){ if(Process::execute("git rev-parse HEAD", $out) === 0 and $out !== false and strlen($out = trim($out)) === 40){
$gitHash = trim($out); $gitHash = trim($out);
if(Process::execute("git diff --quiet") === 1 or Utils::execute("git diff --cached --quiet") === 1){ //Locally-modified if(Process::execute("git diff --quiet") === 1 or Process::execute("git diff --cached --quiet") === 1){ //Locally-modified
$gitHash .= "-dirty"; $gitHash .= "-dirty";
} }
} }