From 5c7db71bbbdfdb9fd04a1ed090565fa8afe1258f Mon Sep 17 00:00:00 2001
From: Prachi Damle <prachi@cloud.com>
Date: Thu, 10 Oct 2013 00:47:36 -0700
Subject: [PATCH] Duplicate getter-setter after merge

---
 .../org/apache/cloudstack/acl/AclRolePermissionVO.java    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/engine/schema/src/org/apache/cloudstack/acl/AclRolePermissionVO.java b/engine/schema/src/org/apache/cloudstack/acl/AclRolePermissionVO.java
index bb993d03884..d1a8e32068e 100644
--- a/engine/schema/src/org/apache/cloudstack/acl/AclRolePermissionVO.java
+++ b/engine/schema/src/org/apache/cloudstack/acl/AclRolePermissionVO.java
@@ -115,12 +115,4 @@ public class AclRolePermissionVO implements AclRolePermission {
         this.allowed = allowed;
     }
 
-    @Override
-    public PermissionScope getScope() {
-        return scope;
-    }
-
-    public void setScope(PermissionScope scope) {
-        this.scope = scope;
-    }
 }