修正・変更

[chemicraft/chemicraft.git] / common / pcc / chemicraft / gui / GuiElectrolysisTable.java

diff --git a/common/pcc/chemicraft/gui/GuiElectrolysisTable.java b/common/pcc/chemicraft/gui/GuiElectrolysisTable.java
index 3fd6b22..a8062c8 100644 (file)
--- a/common/pcc/chemicraft/gui/GuiElectrolysisTable.java
+++ b/common/pcc/chemicraft/gui/GuiElectrolysisTable.java
@@ -1,16 +1,10 @@
 package pcc.chemicraft.gui;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.container.ContainerElectrolysisTable;
-import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
-<<<<<<< HEAD:common/pcc/chemicraft/gui/GuiElectrolysisTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.container.ContainerElectrolysisTable;
 import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/gui/GuiElectrolysisTable.java
 
 public class GuiElectrolysisTable extends GuiContainer
 {