Only attempt to remove resources from the event if they have actually
authorMichael J. Rubinsky <mrubinsk@horde.org>
Thu, 10 Sep 2009 16:12:20 +0000 (12:12 -0400)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Tue, 29 Sep 2009 20:53:59 +0000 (16:53 -0400)
accepted the event.

kronolith/lib/Resource/Single.php

index 3209166..75f1680 100644 (file)
@@ -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