Fix merge conflicts

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

@@ -1,4 +1,4 @@
-From 572ada533f8279e545e6cd0c410c7de76c384a76 Mon Sep 17 00:00:00 2001
+From 3f2bae5366aa36f78b4070aebecd75e9ae8ffb4c 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
@@ -161,14 +161,13 @@ index d3ae91b..0b71b53 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index 5584353..8f5689f 100644
+index c4db462..fa6e826 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -194,4 +194,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
- 
-         return getScoreboard();
+@@ -214,5 +214,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+         return !(this.team != other.team && (this.team == null || !this.team.equals(other.team)));
      }
-+
+ 
 +    // Spigot start
 +    @Override
 +    public Set<String> getEntries() throws IllegalStateException {
@@ -190,6 +189,7 @@ index 5584353..8f5689f 100644
 +        throw new UnsupportedOperationException("Not supported yet.");
 +    }
 +    // Spigot end
+ 
  }
 -- 
 2.1.0