From 747776344b275b02f37a7857b560d198c9ba0838 Mon Sep 17 00:00:00 2001
From: snowleo <schneeleo@gmail.com>
Date: Sat, 16 Jul 2011 13:32:10 +0200
Subject: [PATCH] Fixing merge error

---
 .../src/com/earth2me/essentials/commands/Commandspawner.java  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
index 1acbf13b8..5e95bad65 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
@@ -5,10 +5,6 @@ import com.earth2me.essentials.Util;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.block.Block;
-<<<<<<< HEAD
-import org.bukkit.block.CreatureSpawner;
-=======
->>>>>>> master
 import org.bukkit.craftbukkit.block.CraftCreatureSpawner;
 import org.bukkit.entity.CreatureType;