Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft

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

diff --git a/common/pcc/chemicraft/item/ItemAtomInfoContainer.java b/common/pcc/chemicraft/item/ItemAtomInfoContainer.java
index f57e822..d1d6dd8 100644 (file)
--- a/common/pcc/chemicraft/item/ItemAtomInfoContainer.java
+++ b/common/pcc/chemicraft/item/ItemAtomInfoContainer.java
@@ -1,7 +1,11 @@
 package pcc.chemicraft.item;
 
+import pcc.chemicraft.util.AtomInfo;
 import net.minecraft.item.Item;
+<<<<<<< HEAD:common/pcc/chemicraft/item/ItemAtomInfoContainer.java
+=======
 import pcc.chemicraft.util.AtomInfo;
+>>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/item/ItemAtomInfoContainer.java
 
 public class ItemAtomInfoContainer extends Item {