Merge branch 'groupmanager' of

https://ElgarL@github.com/essentials/Essentials.git into groupmanager

Conflicts:
	EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java

1 files changed, 3 insertions, 3 deletions

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index b145e8f90..6b81f17d0 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -425,10 +425,10 @@ public class BukkitPermissions {
 

 			updatePermissions(event.getPlayer(), event.getPlayer().getWorld().getName());

 		}

-

+
 		/*

 		 * Trigger at highest so we tidy up last.

-		 */

+		 */
 		@EventHandler(priority = EventPriority.HIGHEST)

 		public void onPlayerQuit(PlayerQuitEvent event) {

 

@@ -464,4 +464,4 @@ public class BukkitPermissions {
 		}

 	}

 

-}
\ No newline at end of file
+}