Fix some merge conflicts

By: md_5 <git@md-5.net>

CraftBukkit-Patches/0100-Allow-Configuring-Chunks-per-Packet.patch

@@ -1,14 +1,14 @@
-From 920472922c16c6e762e3fe48c102cd3f4e17aba1 Mon Sep 17 00:00:00 2001
+From cf581b8daf7b5d52b0b12fea8e25ac60a83efe01 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 28 Jan 2014 20:35:35 +1100
 Subject: [PATCH] Allow Configuring Chunks per Packet
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b8c3540..f01d798 100644
+index d749254..4ad2eeb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -202,7 +202,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -209,7 +209,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
              Chunk chunk;
  
@@ -34,5 +34,5 @@ index ffdb33e..1290829 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2