From 4cfceeeb8e434978b111fa33a6ec158bab3e4adc Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 29 Nov 2019 12:03:07 +0000 Subject: [PATCH] bootstrap: fix merge error introduced by cb76f8a5dfba79857ecfd71d2953b759a03671e7 this error is harmless since it points to a deprecated function, but it showed up as conflicted in master merge. --- src/pocketmine/PocketMine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 97a602a5b4..10de566e79 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -190,7 +190,7 @@ namespace pocketmine { if(\Phar::running(true) === ""){ if(Process::execute("git rev-parse HEAD", $out) === 0 and $out !== false and strlen($out = trim($out)) === 40){ $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"; } }