From 51d4cf1b617628e96c29b70303e29d841b2211ac Mon Sep 17 00:00:00 2001
From: Acrobot <andrzejp@dysleksja.pl>
Date: Sun, 28 Oct 2012 23:56:40 +0100
Subject: [PATCH] I hate you too, GitHub for Windows

---
 com/Acrobot/Breeze/Utils/MaterialUtil.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/com/Acrobot/Breeze/Utils/MaterialUtil.java b/com/Acrobot/Breeze/Utils/MaterialUtil.java
index d54c321..9f87253 100644
--- 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>();
             }