Fixed a merge error.

2012-03-12 15:51:11 -04:00 · 2012-03-12 15:51:11 -04:00 · 9acdb5b620
commit 9acdb5b620
parent 340eede26c
3 changed files with 36 additions and 37 deletions
--- a/forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch
@ -56,7 +56,6 @@
     }
 
@@ -960,4 +966,49 @@
->>>>>>> MCP Update.  Fixed a few small bugs in the linux scripts.
     {
         return true;
     }