Fix merge conflicts

2015-01-25 14:44:52 +00:00
parent 553a96920a
commit ea2b36a864
2 changed files with 7 additions and 6 deletions
--- 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
+ 
 }
 --