From e8f6d4107b99d9ea902bdd33d4696140be15e9de Mon Sep 17 00:00:00 2001
From: Glitchfinder <glitchkey@gmail.com>
Date: Sun, 6 Jan 2013 18:02:52 -0800
Subject: [PATCH] Merge conflicts are fun.

---
 .../com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
index 0eb94eafe..aff0a0e93 100644
--- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
@@ -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();
     }
 
     /**