From 486e92dfc910e601154ef8ad9d5b34e283cca6d5 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Sat, 14 Aug 2021 22:25:14 +0200 Subject: [PATCH] another I hate this --- src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java | 3 --- 1 file changed, 3 deletions(-) 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 08bfcd096..1ff5c5bd9 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,7 @@ 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; -======= ->>>>>>> master import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.World; import org.bukkit.entity.Player;