From 989dd8db52b667ff62e32346a5c30d4d8ba9dcde Mon Sep 17 00:00:00 2001
From: ghac <simon.leiss93@gmail.com>
Date: Fri, 29 Apr 2016 17:10:32 +0200
Subject: [PATCH] Fix missing merge.

---
 proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java | 4 ----
 1 file changed, 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
index ac2609539b..e9530af965 100644
--- a/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
+++ b/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
@@ -14,7 +14,6 @@
 
 public class PlayerInfoSerializer implements JsonSerializer<ServerPing.PlayerInfo>, JsonDeserializer<ServerPing.PlayerInfo>
 {
-<<<<<<< HEAD
     private final int protocol;
 
     public PlayerInfoSerializer(int protocol)
@@ -22,9 +21,6 @@ public PlayerInfoSerializer(int protocol)
         this.protocol = protocol;
     }
     
-=======
-
->>>>>>> 80b3135a93f0e23489cc19086e31feb12ff51798
     @Override
     public ServerPing.PlayerInfo deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException
     {