Author: florin Date: 2006-05-07 12:13:42 +0000 (Sun, 07 May 2006) New Revision: 19988 Removed: moonbase/trunk/web/Zope3/CONFLICTS Log: remove the 2.x version. it's better to use the 3.x version instead. Deleted: moonbase/trunk/web/Zope3/CONFLICTS