Fix missing merge.

HexagonMC · Apr 29, 2016 · 989dd8d · 989dd8d
1 parent 7ee40a0
commit 989dd8d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java b/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
@@ -14,17 +14,13 @@
 
 public class PlayerInfoSerializer implements JsonSerializer<ServerPing.PlayerInfo>, JsonDeserializer<ServerPing.PlayerInfo>
 {
-<<<<<<< HEAD
     private final int protocol;
 
     public PlayerInfoSerializer(int protocol)
     {
         this.protocol = protocol;
     }
 
-=======
-
->>>>>>> 80b3135a93f0e23489cc19086e31feb12ff51798
     @Override
     public ServerPing.PlayerInfo deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException
     {