修正・変更

[chemicraft/chemicraft.git] / common / pcc / chemicraft / container / ContainerChemicalCraftingTable.java

diff --git a/common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java b/common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
index aa66cd0..9492bcd 100644 (file)
--- a/common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
+++ b/common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
@@ -1,24 +1,11 @@
 package pcc.chemicraft.container;
 
-<<<<<<< HEAD:common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.ChemiCraftAPI;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
-import pcc.chemicraft.slot.SlotChemicalCraftingTableResult;
-import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import pcc.chemicraft.util.ChemicalNBTRecipe;
-=======
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-<<<<<<< HEAD:common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftAPI;
 import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
@@ -27,7 +14,6 @@ import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
 import pcc.chemicraft.slot.SlotChemicalCraftingTableResult;
 import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 import pcc.chemicraft.util.ChemicalNBTRecipe;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
 
 public class ContainerChemicalCraftingTable extends Container {