From a9289df93f9e8119fef227365be9a25bcc716b1d Mon Sep 17 00:00:00 2001
From: CocoTheOwner <sjoerdvdgoor02@gmail.com>
Date: Sat, 14 Aug 2021 23:25:15 +0200
Subject: [PATCH] another I hate this

---
 src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java | 4 ++++
 1 file changed, 4 insertions(+)

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 d930f6b48..dc59489a0 100644
--- a/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java
+++ b/src/main/java/com/volmit/iris/util/decree/DecreeExecutor.java
@@ -21,6 +21,10 @@ 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 {