Merge remote branch 'remotes/origin/groupmanager'

This commit is contained in:
KHobbits 2012-01-17 23:49:38 +00:00
commit 79a13e97a2
2 changed files with 2 additions and 2 deletions

View file

@ -101,3 +101,4 @@ v 1.8:
- Major, MAJOR changes to support partial/full world mirroring. - Major, MAJOR changes to support partial/full world mirroring.
You can now mirror groups.yml, users.yml or both files between different worlds. You can now mirror groups.yml, users.yml or both files between different worlds.
- Catch NullPointerErrors generated by blank permission nodes. - Catch NullPointerErrors generated by blank permission nodes.
- Removed '- bukkit.command' form the globalgroups permission nodes.

View file

@ -145,7 +145,6 @@ groups:
permissions: permissions:
- bukkit.broadcast - bukkit.broadcast
- bukkit.broadcast.admin - bukkit.broadcast.admin
- bukkit.command
- bukkit.command.give - bukkit.command.give
- bukkit.command.help - bukkit.command.help
- bukkit.command.kill - bukkit.command.kill