I hate you too, GitHub for Windows

2012-10-28 23:56:40 +01:00 · 2012-10-28 23:56:40 +01:00 · 51d4cf1b61
parent efc8a32f98
commit 51d4cf1b61
1 changed files with 0 additions and 4 deletions
--- a/com/Acrobot/Breeze/Utils/MaterialUtil.java
+++ b/com/Acrobot/Breeze/Utils/MaterialUtil.java
@ -241,11 +241,7 @@ public class MaterialUtil {
         * @return Enchantments found
         */
        public static Map<org.bukkit.enchantments.Enchantment, Integer> getEnchantments(String base32) {
-<<<<<<< HEAD
-            if (base32 == null || base32.isEmpty() || NumberUtil.isLong(base32)) {
-=======
            if (base32 == null || base32.isEmpty() || !NumberUtil.isEnchantment(base32)) {
->>>>>>> Fixed enchantments -.-
                return new HashMap<org.bukkit.enchantments.Enchantment, Integer>();
            }