Fix merge conflicts.

Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch

@@ -9,9 +9,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
-     */
-     boolean hasConflictingEnchant(Enchantment ench);
  
+     @SuppressWarnings("javadoc")
+     ItemMeta clone();
++
 +    // Spigot start
 +    public class Spigot
 +    {
@@ -39,8 +40,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    Spigot spigot();
 +    // Spigot end
-+
-     @SuppressWarnings("javadoc")
-     ItemMeta clone();
  }
 --