From c7d586cc2a619b49181c43befa79ad8c50c6188e Mon Sep 17 00:00:00 2001
From: thisfro <jannis@thisfro.ch>
Date: Tue, 6 Oct 2020 13:56:23 +0200
Subject: [PATCH] use printf

---
 index.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/index.php b/index.php
index 0e258b1..9d36550 100644
--- a/index.php
+++ b/index.php
@@ -13,13 +13,8 @@
                 printf("<h2 class='online status'>online</h2>");
                 printf("<p>running version:</p>");
                 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("<h2>%s / %s</h2>)", $ms->get_current_players(), $ms->get_max_players();
->>>>>>> effa2a3d35936394ce471d0870b9ac188b0177f9
             }
             else {
                 echo("<p>The Server is:</p>");