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

Compare commits

base: thisfro:19a8d6a4e40c8dbf71921ebc3b2f845f2bafe5ce
Branches Tags
thisfro:master
..
compare: thisfro:effa2a3d35936394ce471d0870b9ac188b0177f9
Branches Tags
thisfro:master

No commits in common. "19a8d6a4e40c8dbf71921ebc3b2f845f2bafe5ce" and "effa2a3d35936394ce471d0870b9ac188b0177f9" have entirely different histories.
19a8d6a4e4 ... effa2a3d35

1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
index.php
View file

@ -11,15 +11,10 @@
printf("<h3>Join on server.thisfro.ch!</h3>"); printf("<h3>Join on server.thisfro.ch!</h3>");
printf("<p>The Server is: </p>"); printf("<p>The Server is: </p>");
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("<h2>%s / %s</h2>", $ms->get_current_players(), $ms->get_max_players());
=======
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();
>>>>>>> effa2a3d35936394ce471d0870b9ac188b0177f9
} }
else { else {
echo("<p>The Server is:</p>"); echo("<p>The Server is:</p>");