From 52e6874bde3f704043d0be44d455ff063f86f3ca Mon Sep 17 00:00:00 2001
From: franga2000 <miha.frangez@gmail.com>
Date: Thu, 19 Mar 2015 19:50:27 +0100
Subject: [PATCH] Git this is getting anoying!! STAHP!!!

---
 server/index.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/server/index.php b/server/index.php
index 9b9e41f..2a30e0e 100644
--- a/server/index.php
+++ b/server/index.php
@@ -49,12 +49,6 @@
 		<?php foreach ($players as $player): ?>
 			<div class="col-md-2 player">
 				<img src="<?php echo "https://cravatar.eu/" . $avatar_prefix . "/" . $player . "/96" ?>" class="img-rounded">
-<<<<<<< HEAD
-=======
-				<img src="<?php echo "https://cravatar.eu/" . ($config['3d_avatars'] ? "helmhead" : "helmavatar") . "/" . $player . "/96" ?>" class="img-rounded">
->>>>>>> cb5d8b6... Update index.php
-=======
->>>>>>> 805ff4b... Git being terrible
 				<p><?php echo $player ?></p>
 			</div>
 		<?php endforeach ?>
@@ -77,4 +71,4 @@
     display: inline-block;
     padding: 5px 10px;
 }
-</style>
+</style>
\ No newline at end of file