Fix merge conflicts.

2015-01-25 10:37:00 +11:00
parent a0fb646609
commit 0affb6adab
3 changed files with 5 additions and 7 deletions
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@@ -191,6 +191,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Spigot end
 }
-- 
-1.9.5.msysgit.0
-
+--