Auto stash before merge of "master" and "origin/master"

2025-12-27 19:19:07 +00:00 · 2021-08-13 05:56:52 -04:00
parent 611ccd9605
commit 7153347d67
1 changed files with 4 additions and 0 deletions
--- 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