Fix conflicts.

2015-07-10 22:33:16 +10:00
parent 950d51d5e3
commit 84c55fb710
3 changed files with 5 additions and 5 deletions
--- a/Bukkit-Patches/0004-BungeeCord-Support.patch
+++ b/Bukkit-Patches/0004-BungeeCord-Support.patch
@@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
-      * {@link GameMode#SPECTATOR}
      */
-     public void setSpectatorTarget(Entity entity);
+     @Deprecated
+     public void resetTitle();
 +
 +    // Spigot start
 +    public class Spigot extends Entity.Spigot