mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
cyberpwn 2021-08-13 05:56:52 -04:00
parent 611ccd9605
commit 7153347d67
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/volmit/iris/util/decree/EXAMPLE.java
View File

@ -18,6 +18,10 @@
package com.volmit.iris.util.decree; package com.volmit.iris.util.decree;
<<<<<<< Updated upstream
=======
import com.volmit.iris.engine.object.biome.IrisBiome;
>>>>>>> Stashed changes
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class EXAMPLE public class EXAMPLE