Log message for revision 71847:
Merge from 2.10 branch:
Log message for revision 71846:
Back out accidental commit from yesterday
Changed:
U Zope/trunk/skel/etc/site.zcml
-=-
Modified: Zope/trunk/skel/etc/site.zcml
===================================================================
--- Zope/trunk/skel/etc/site.zcml 2007-01-09 14:25:34 UTC (rev 71846)
+++ Zope/trunk/skel/etc/site.zcml 2007-01-09 14:26:26 UTC (rev 71847)
@@ -3,8 +3,6 @@
xmlns:meta="http://namespaces.zope.org/meta";
xmlns:five="http://namespaces.zope.org/five";>
- <meta:provides feature="devmode" />
-
<include package="Products.Five" />
<meta:redefinePermission from="zope2.Public" to="zope.Public" />
@@ -18,6 +16,7 @@
<five:loadProducts />
<!-- Load the configuration overrides-->
+ <includeOverrides files="package-includes/*-overrides.zcml" />
<five:loadProductsOverrides />
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
