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

[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" <kentsin@macau.ctm.net>
To: <zope-dev@zope.org>
Sent: Tuesday, June 05, 2001 7:56 PM
Subject: [Zope-dev] __init__.py of ZServer is diff format?


> 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  -  Zope-Dev@zope.org
> http://lists.zope.org/mailman/listinfo/zope-dev
> **  No cross posts or HTML encoding!  **
> (Related lists - 
>  http://lists.zope.org/mailman/listinfo/zope-announce
>  http://lists.zope.org/mailman/listinfo/zope )