diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java b/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java index dc59489a0..d930f6b48 100644 --- a/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java +++ b/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java @@ -21,10 +21,6 @@ package com.volmit.iris.util.decree; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.platform.PlatformChunkGenerator; -<<<<<<< HEAD -======= -import com.volmit.iris.util.format.C; ->>>>>>> 486e92d... another I hate this import com.volmit.iris.util.plugin.VolmitSender; public interface DecreeExecutor {