From 8487abd465deda8e7b3fe1e6f241bfa94e18d83f Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Wed, 9 Sep 2009 15:31:28 -0400
Subject: [PATCH] Move hasPermisson to the base class, implement ::get() to
 behave like a share.

---
 kronolith/lib/Resource/Single.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/kronolith/lib/Resource/Single.php b/kronolith/lib/Resource/Single.php
index bb61f600a..3209166f7 100644
--- 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
-- 
2.11.0