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

[chemicraft/chemicraft.git] / common / pcc / chemicraft / render / RenderAtomsGrenade.java

diff --git a/common/pcc/chemicraft/render/RenderAtomsGrenade.java b/common/pcc/chemicraft/render/RenderAtomsGrenade.java
index c987f7e..7fa5568 100644 (file)
--- a/common/pcc/chemicraft/render/RenderAtomsGrenade.java
+++ b/common/pcc/chemicraft/render/RenderAtomsGrenade.java
@@ -9,7 +9,10 @@ import org.lwjgl.opengl.GL12;
 
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.entity.EntityAtomsGrenade;
+<<<<<<< HEAD:common/pcc/chemicraft/render/RenderAtomsGrenade.java
 
+=======
+>>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/render/RenderAtomsGrenade.java
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;