[CalendarServer-changes] [5025] CalendarServer/branches/users/glyph/contacts-server-merge/ calendarserver/tap/carddav.py

[source_changes at macosforge.org]

Revision: 5025
          http://trac.macosforge.org/projects/calendarserver/changeset/5025
Author:   glyph at apple.com
Date:     2010-02-02 21:14:14 -0800 (Tue, 02 Feb 2010)
Log Message:
-----------
Import correct name.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/contacts-server-merge/calendarserver/tap/carddav.py

Modified: CalendarServer/branches/users/glyph/contacts-server-merge/calendarserver/tap/carddav.py
===================================================================
--- CalendarServer/branches/users/glyph/contacts-server-merge/calendarserver/tap/carddav.py	2010-02-03 04:50:25 UTC (rev 5024)
+++ CalendarServer/branches/users/glyph/contacts-server-merge/calendarserver/tap/carddav.py	2010-02-03 05:14:14 UTC (rev 5025)
@@ -43,7 +43,7 @@
 except ImportError:
     NegotiateCredentialFactory = None
 
-from calendarserver.provision.root import _ParentRootResource
+from calendarserver.provision.root import RootResource as _ParentRootResource
 
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100202/8f1644ad/attachment.html>