修正・変更

[chemicraft/chemicraft.git] / common / pcc / chemicraft / item / ItemAtoms.java

diff --git a/common/pcc/chemicraft/item/ItemAtoms.java b/common/pcc/chemicraft/item/ItemAtoms.java
index 1854dbb..ad2ae60 100644 (file)
--- a/common/pcc/chemicraft/item/ItemAtoms.java
+++ b/common/pcc/chemicraft/item/ItemAtoms.java
@@ -2,15 +2,10 @@ package pcc.chemicraft.item;
 
 import java.util.List;
 
-import pcc.chemicraft.ChemiCraft;
-
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-<<<<<<< HEAD:common/pcc/chemicraft/item/ItemAtoms.java
-=======
 import pcc.chemicraft.ChemiCraft;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/item/ItemAtoms.java
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;