Fix merge conflicts.

CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch

@@ -1,4 +1,4 @@
-From 337e55ae0f39587d271afff1d4aa561bbb536816 Mon Sep 17 00:00:00 2001
+From 572ada533f8279e545e6cd0c410c7de76c384a76 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations
 This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b4ad7d1..4c33f5a 100644
+index 1f936b0..cd304ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1626,4 +1626,14 @@ public final class CraftServer implements Server {
+@@ -1628,4 +1628,14 @@ public final class CraftServer implements Server {
      public UnsafeValues getUnsafe() {
          return CraftMagicNumbers.INSTANCE;
      }
@@ -192,5 +192,5 @@ index 5584353..8f5689f 100644
 +    // Spigot end
  }
 -- 
-1.9.5.msysgit.0
+2.1.0