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

[chemicraft/chemicraft.git] / common / pcc / chemicraft / slot / SlotChemicalCombinationTableMaterial.java

diff --git a/common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java b/common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
index 77d2c11..f31de6a 100644 (file)
--- a/common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
+++ b/common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
@@ -1,9 +1,13 @@
 package pcc.chemicraft.slot;
 
+import pcc.chemicraft.ChemiCraft;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+<<<<<<< HEAD:common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
+=======
 import pcc.chemicraft.ChemiCraft;
+>>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
 
 public class SlotChemicalCombinationTableMaterial extends Slot {