summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-01-14 15:52:22 +0000
committerKHobbits <rob@khobbits.co.uk>2012-01-14 15:52:22 +0000
commitf0def90301aa7baba98a01763ef41e25c1ead021 (patch)
tree39e941a293af6f0afbcc27ce1b6708f060dc9ac6 /EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
parent856cef32862ba9c15d45b85e00c69fba624c9aa5 (diff)
parentd0e5685ac0afb7bb69df9a17aafe0f78f5fc5aef (diff)
downloadEssentials-f0def90301aa7baba98a01763ef41e25c1ead021.tar
Essentials-f0def90301aa7baba98a01763ef41e25c1ead021.tar.gz
Essentials-f0def90301aa7baba98a01763ef41e25c1ead021.tar.lz
Essentials-f0def90301aa7baba98a01763ef41e25c1ead021.tar.xz
Essentials-f0def90301aa7baba98a01763ef41e25c1ead021.zip
Merge remote branch 'remotes/origin/groupmanager'
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 7c157a2f7..ebaadf8bd 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -287,7 +287,7 @@ public class BukkitPermissions {
* List all effective permissions for this player.
*
* @param player
- * @return
+ * @return List<String> of permissions
*/
public List<String> listPerms(Player player) {
List<String> perms = new ArrayList<String>();