From 7153347d6764d65b32c6a0aec15b19a4e6d349b6 Mon Sep 17 00:00:00 2001
From: cyberpwn <danielmillst@gmail.com>
Date: Fri, 13 Aug 2021 05:56:52 -0400
Subject: [PATCH] Auto stash before merge of "master" and "origin/master"

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

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 bd65c3919..9ad62545c 100644
--- a/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java
+++ b/src/main/java/com/volmit/iris/util/decree/EXAMPLE.java
@@ -18,6 +18,10 @@
 
 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