修正・変更

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

diff --git a/common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java b/common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
index 541b8bd..f1fe61c 100644 (file)
--- a/common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
@@ -4,13 +4,6 @@ import java.io.DataOutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.ChemiCraftData;
-import pcc.chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
-import pcc.chemicraft.inventory.InventoryChemicalCombinationTableResult;
-import pcc.chemicraft.system.PacketHandler;
-import pcc.chemicraft.util.ComparatorItemStack;
-
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
@@ -18,15 +11,12 @@ 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/TileEntityChemicalCombinationTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftData;
 import pcc.chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
 import pcc.chemicraft.inventory.InventoryChemicalCombinationTableResult;
 import pcc.chemicraft.system.PacketHandler;
 import pcc.chemicraft.util.ComparatorItemStack;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
 
 import com.google.common.io.ByteArrayDataInput;