[CalendarServer-changes] [9799] CalendarServer/branches/users/gaya/inviteclean/txdav/base/ propertystore/sql.py

[source_changes at macosforge.org]

Revision: 9799
          http://trac.macosforge.org/projects/calendarserver/changeset/9799
Author:   gaya at apple.com
Date:     2012-09-10 13:25:06 -0700 (Mon, 10 Sep 2012)
Log Message:
-----------
fix last change

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/inviteclean/txdav/base/propertystore/sql.py

Modified: CalendarServer/branches/users/gaya/inviteclean/txdav/base/propertystore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/inviteclean/txdav/base/propertystore/sql.py	2012-09-10 20:08:57 UTC (rev 9798)
+++ CalendarServer/branches/users/gaya/inviteclean/txdav/base/propertystore/sql.py	2012-09-10 20:25:06 UTC (rev 9799)
@@ -73,19 +73,11 @@
 
     @classmethod
     @inlineCallbacks
-<<<<<<< .working
     def load(cls, defaultuser, shareUser, txn, resourceID, created=False, notifyCallback=None):
         """
         @param notifyCallback: a callable used to trigger notifications when the
             property store changes.
         """
-=======
-    def load(cls, defaultuser, txn, resourceID, created=False, notifyCallback=None):
-        """
-        @param notifyCallback: a callable used to trigger notifications when the
-            property store changes.
-        """
->>>>>>> .merge-right.r9784
         self = cls.__new__(cls)
         super(PropertyStore, self).__init__(defaultuser, shareUser)
         self._txn = txn
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120910/07643154/attachment.html>