Merge pull request #443 from Glitchfinder/master

Merge conflicts are fun.
This commit is contained in:
Glitchfinder 2013-01-06 18:03:56 -08:00
commit 95ed33b2ce

View File

@ -18,7 +18,6 @@ public class AcrobaticsManager {
this.player = player;
this.profile = Users.getProfile(player);
this.skillLevel = profile.getSkillLevel(SkillType.ACROBATICS);
this.permissionInstance = Permissions.getInstance();
}
/**