Merge from 2.10 branch:

Log message for revision 71846: Back out accidental commit from yesterday

Merge from 2.10 branch:
Log message for revision 71846: Back out accidental commit from yesterday
ad5272e5 · Philipp von Weitershausen · 4be9a02f · ad5272e5
Commit ad5272e5 authored Jan 09, 2007 by Philipp von Weitershausen
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

skel/etc/site.zcml skel/etc/site.zcml +1 -2

No files found.
--- a/skel/etc/site.zcml
+++ b/skel/etc/site.zcml
@@ -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 />