Move hasPermisson to the base class, implement ::get() to behave like

a share.

diff --git a/kronolith/lib/Resource/Single.php b/kronolith/lib/Resource/Single.php
index bb61f60..3209166 100644 (file)
--- a/kronolith/lib/Resource/Single.php
+++ b/kronolith/lib/Resource/Single.php
@@ -141,26 +141,8 @@ class Kronolith_Resource_Single extends Kronolith_Resource_Base
         }
     }
 
-<<<<<<< HEAD
     public function getResponseType()
     {
         return $this->get('response_type');
-=======
-    /**
-     * @TODO: need to fine tune this
-     * @param $user
-     * @param $permission
-     * @param $restrict
-     * @return unknown_type
-     */
-    public function hasPermission($user, $permission = PERMS_READ, $restrict = null)
-    {
-        if (Horde_Auth::isAdmin()) {
-            return true;
-        }
-
-        return false;
->>>>>>> listEvents:: isn't detailed enough for this...manually compare
     }
-
 }
\ No newline at end of file