Fix last merge

1 files changed, 1 insertions, 10 deletions

diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index cb47e661b..07c7b018f 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -142,17 +142,8 @@ class acl extends rcube_plugin
             return $args;
         }
 */
-        // Get MYRIGHTS
-<<<<<<< HEAD
-        if (!($myrights = $args['options']['rights'])) {
-            return $args;
-        }
-
-        // Do nothing if no ACL support
-        if (!$this->rc->imap->get_capability('ACL')) {
-=======
+        // Check if myrights is set
         if (empty($myrights)) {
->>>>>>> e4c9942... Fix handling of MYRIGHTS on private namespace roots - fixes issue where
             return $args;
         }