Skip to content

Commit

Permalink
Git this is getting anoying!! STAHP!!!
Browse files Browse the repository at this point in the history
  • Loading branch information
franga2000 committed Mar 19, 2015
1 parent fa48574 commit 52e6874
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions server/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?>
Expand All @@ -77,4 +71,4 @@
display: inline-block;
padding: 5px 10px;
}
</style>
</style>

0 comments on commit 52e6874

Please sign in to comment.