From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Thu, 10 Sep 2009 16:12:20 +0000 (-0400)
Subject: Only attempt to remove resources from the event if they have actually
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ce180f27f55ef7124c3b78d84ca27946ce524c52;p=horde.git

Only attempt to remove resources from the event if they have actually
accepted the event.
---

diff --git a/kronolith/lib/Resource/Single.php b/kronolith/lib/Resource/Single.php
index 3209166f7..75f168006 100644
--- a/kronolith/lib/Resource/Single.php
+++ b/kronolith/lib/Resource/Single.php
@@ -141,8 +141,11 @@ class Kronolith_Resource_Single extends Kronolith_Resource_Base
         }
     }
 
+<<<<<<< HEAD
     public function getResponseType()
     {
         return $this->get('response_type');
     }
+=======
+>>>>>>> Only attempt to remove resources from the event if they have actually
 }
\ No newline at end of file