Merge from 2.10 branch:

  Log message for revision 71846:
    Back out accidental commit from yesterday
parent 4be9a02f
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
xmlns:meta="http://namespaces.zope.org/meta" xmlns:meta="http://namespaces.zope.org/meta"
xmlns:five="http://namespaces.zope.org/five"> xmlns:five="http://namespaces.zope.org/five">
<meta:provides feature="devmode" />
<include package="Products.Five" /> <include package="Products.Five" />
<meta:redefinePermission from="zope2.Public" to="zope.Public" /> <meta:redefinePermission from="zope2.Public" to="zope.Public" />
...@@ -18,6 +16,7 @@ ...@@ -18,6 +16,7 @@
<five:loadProducts /> <five:loadProducts />
<!-- Load the configuration overrides--> <!-- Load the configuration overrides-->
<includeOverrides files="package-includes/*-overrides.zcml" />
<five:loadProductsOverrides /> <five:loadProductsOverrides />
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment