From 1f932434c21ccfc02034fd1c658dd87d1a826c4d Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Sat, 9 Feb 2013 10:51:16 +0000
Subject: [PATCH] Fix bad Git Merge

---
 .../src/org/anjocaido/groupmanager/GroupManager.java         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index 74778f495..14006bf75 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -397,11 +397,6 @@ public class GroupManager extends JavaPlugin {
 		  	return true;
 		}
 
-		if (sender.getClass().getName().equals("org.bukkit.craftbukkit.command.CraftBlockCommandSender")) {
-			sender.sendMessage(ChatColor.RED + "GM Commands can not be called from CommandBlocks");
-			return true;
-		}
-
 		// DETERMINING PLAYER INFORMATION
 		if (sender instanceof Player) {
 			senderPlayer = (Player) sender;