Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-10-17 17:05:20 +02:00
Code Issues Projects Releases Wiki Activity

Fixing merge error

Browse Source
This commit is contained in:
snowleo 2011-07-16 13:32:10 +02:00
parent f979a79081
commit 747776344b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
View File

@ -5,10 +5,6 @@ import com.earth2me.essentials.Util;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.block.Block; import org.bukkit.block.Block;
<<<<<<< HEAD
import org.bukkit.block.CreatureSpawner;
=======
>>>>>>> master
import org.bukkit.craftbukkit.block.CraftCreatureSpawner; import org.bukkit.craftbukkit.block.CraftCreatureSpawner;
import org.bukkit.entity.CreatureType; import org.bukkit.entity.CreatureType;