修正・変更

[chemicraft/chemicraft.git] / common / pcc / chemicraft / tileentity / TileEntityChemicalCraftingTable.java

diff --git a/common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java b/common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
index 6caa073..b0ab691 100644 (file)
--- a/common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
+++ b/common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
@@ -2,24 +2,16 @@ package pcc.chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 
-import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
-import pcc.chemicraft.system.PacketHandler;
-
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
-<<<<<<< HEAD:common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
-=======
 import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
 import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT;
 import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
 import pcc.chemicraft.system.PacketHandler;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
 
 import com.google.common.io.ByteArrayDataInput;