thisfro/minecraft-status
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.thisfro.ch:222/thisfro/minecraft-status into master

Browse source
This commit is contained in:
Jannis Portmann 2020-10-06 13:54:56 +02:00
commit 19a8d6a4e4
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
index.php
View file

@ -13,8 +13,13 @@
printf("<h2 class='online status'>online</h2>"); printf("<h2 class='online status'>online</h2>");
printf("<p>running version:</p>"); printf("<p>running version:</p>");
printf("<h2>%s</h2><br>", $ms->get_version()); printf("<h2>%s</h2><br>", $ms->get_version());
<<<<<<< HEAD
printf("<p>Players online:</p>"); printf("<p>Players online:</p>");
printf("<h2>%s / %s</h2>", $ms->get_current_players(), $ms->get_max_players()); printf("<h2>%s / %s</h2>", $ms->get_current_players(), $ms->get_max_players());
=======
printf("<p>Players online</p>");
printf("<h2>%s / %s</h2>)", $ms->get_current_players(), $ms->get_max_players();
>>>>>>> effa2a3d35936394ce471d0870b9ac188b0177f9
} }
else { else {
echo("<p>The Server is:</p>"); echo("<p>The Server is:</p>");