From 9a58e121e827a73f8f8e60302e647e106634d522 Mon Sep 17 00:00:00 2001
From: cyberpwn <danielmillst@gmail.com>
Date: Fri, 13 Aug 2021 05:58:44 -0400
Subject: [PATCH] Fix example

---
 src/main/java/com/volmit/iris/util/decree/EXAMPLE.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java b/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java
index 9ad62545c..bd65c3919 100644
--- a/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java
+++ b/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java
@@ -18,10 +18,6 @@
 
 package com.volmit.iris.util.decree;
 
-<<<<<<< Updated upstream
-=======
-import com.volmit.iris.engine.object.biome.IrisBiome;
->>>>>>> Stashed changes
 import org.bukkit.entity.Player;
 
 public class EXAMPLE