summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2012-07-10 14:27:50 +0100
committerElgarL <ElgarL@palmergames.com>2012-07-10 14:27:50 +0100
commit8fac5f6beb0bd6efb4881857222aaff263a75fca (patch)
tree97821cfa3e0df5f813d0499c14c3e6a9ecc99d44 /EssentialsGroupManager/src/org
parenta46497255ecb600bcee8ecca99fff53dd0b716f4 (diff)
parentefec7c8f95ee8bb5c618f27cfd67f91369fc280b (diff)
downloadEssentials-8fac5f6beb0bd6efb4881857222aaff263a75fca.tar
Essentials-8fac5f6beb0bd6efb4881857222aaff263a75fca.tar.gz
Essentials-8fac5f6beb0bd6efb4881857222aaff263a75fca.tar.lz
Essentials-8fac5f6beb0bd6efb4881857222aaff263a75fca.tar.xz
Essentials-8fac5f6beb0bd6efb4881857222aaff263a75fca.zip
Merge branch 'groupmanager' of
https://ElgarL@github.com/essentials/Essentials.git into groupmanager Conflicts: EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
Diffstat (limited to 'EssentialsGroupManager/src/org')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java6
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
+}