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

[chemicraft/chemicraft.git] / common / pcc / chemicraft / util / Auxiliary.java

diff --git a/common/pcc/chemicraft/util/Auxiliary.java b/common/pcc/chemicraft/util/Auxiliary.java
index e8c64d8..296da96 100644 (file)
--- a/common/pcc/chemicraft/util/Auxiliary.java
+++ b/common/pcc/chemicraft/util/Auxiliary.java
@@ -1,7 +1,10 @@
 package pcc.chemicraft.util;
+<<<<<<< HEAD:common/pcc/chemicraft/util/Auxiliary.java
 
 import java.util.ArrayList;
 import java.util.Random;
+=======
+>>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/util/Auxiliary.java
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;