TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 12:23:59 +00: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;