Re: [Zope-dev] __init__.py of ZServer is diff format?

2001-06-05 Thread Andreas Jung
Looks like a merge conflict during the cvs update. Try a fresh checkout or remove the file and retry cvs update. Andreas - Original Message - From: "Sin Hang Kin" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Tuesday, June 05, 2001 7:56 PM Subject: [Zope-dev]

[Zope-dev] __init__.py of ZServer is diff format?

2001-06-05 Thread Sin Hang Kin
I update zope from cvs this morning. The ZServer/__init__.py contain __init__.py is it in diff format? Rgs, Kent Sin - kentsin.weblogs.com kentsin.imeme.net ___ Zope-Dev maillist - [EMAIL PROTECTED] http://li