[CalendarServer-changes] [960] CalendarServer/branches/users/dreid/cluster-2/twistedcaldav/config.py

[source_changes at macosforge.org]

Revision: 960
          http://trac.macosforge.org/projects/calendarserver/changeset/960
Author:   dreid at apple.com
Date:     2007-01-08 09:03:26 -0800 (Mon, 08 Jan 2007)

Log Message:
-----------
fix incorrect conflict

Modified Paths:
--------------
    CalendarServer/branches/users/dreid/cluster-2/twistedcaldav/config.py

Modified: CalendarServer/branches/users/dreid/cluster-2/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/dreid/cluster-2/twistedcaldav/config.py	2007-01-08 17:01:57 UTC (rev 959)
+++ CalendarServer/branches/users/dreid/cluster-2/twistedcaldav/config.py	2007-01-08 17:03:26 UTC (rev 960)
@@ -62,9 +62,6 @@
         },
     'AdminPrincipals': ['/principals/user/admin'],
 
-<<<<<<< .working
-
-=======
     'twistdLocation': '/usr/share/caldavd/bin/twistd',
     'pydirLocation': '/usr/share/caldavd/bin/pydir++.py',
     'pydirConfig': '/etc/caldavd/pydir.xml',
@@ -80,7 +77,6 @@
         },
     }
 
->>>>>>> .merge-right.r955
 class Config (object):
     def __init__(self, defaults):
         self.update(defaults)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070108/c7f64579/attachment.html