From ea2b36a8643571f9dbfa8d421a6a04d0d107fb30 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sun, 25 Jan 2015 14:44:52 +0000
Subject: [PATCH] Fix merge conflicts

---
 .../0003-Skeleton-API-Implementations.patch                | 6 +++---
 .../0109-Expand-team-API-to-allow-arbitrary-strings.patch  | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
index f15da1fb7b..fa3762c27e 100644
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@@ -165,10 +165,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 @@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
- 
-         return getScoreboard();
+         return !(this.team != other.team && (this.team == null || !this.team.equals(other.team)));
      }
-+
+ 
 +    // Spigot start
 +    @Override
 +    public Set<String> getEntries() throws IllegalStateException {
@@ -190,5 +189,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        throw new UnsupportedOperationException("Not supported yet.");
 +    }
 +    // Spigot end
+ 
  }
 --
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch
index 356c3ca1c1..d2416bb37a 100644
--- a/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch
+++ b/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch
@@ -84,8 +84,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      @Override
 @@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
- 
-         return getScoreboard();
+         final CraftTeam other = (CraftTeam) obj;
+         return !(this.team != other.team && (this.team == null || !this.team.equals(other.team)));
      }
 -
 -    // Spigot start
@@ -108,6 +108,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException {
 -        throw new UnsupportedOperationException("Not supported yet.");
 -    }
--    // Spigot end
+     // Spigot end
+ 
  }
 --
\ No newline at end of file