[z3-checkins] r31269 - z3/jsonserver/branch/merge

[reebalazs at codespeak.net]

Author: reebalazs
Date: Sat Aug 12 16:22:28 2006
New Revision: 31269

Modified:
   z3/jsonserver/branch/merge/configure.zcml
   z3/jsonserver/branch/merge/jsonserver-meta.zcml
Log:
minor fix

Modified: z3/jsonserver/branch/merge/configure.zcml
==============================================================================
--- z3/jsonserver/branch/merge/configure.zcml	(original)
+++ z3/jsonserver/branch/merge/configure.zcml	Sat Aug 12 16:22:28 2006
@@ -6,8 +6,6 @@
            i18n_domain="zope"
            >
 
-  <!-- XXX These are now necessary for the Z2 include. How is the
-       Z3 include different, with all the jsonserver-xxx.zcml stuff? -->
   <include package=".minjson" />
   <include package=".concatresource" />
   <include package=".browser" />

Modified: z3/jsonserver/branch/merge/jsonserver-meta.zcml
==============================================================================
--- z3/jsonserver/branch/merge/jsonserver-meta.zcml	(original)
+++ z3/jsonserver/branch/merge/jsonserver-meta.zcml	Sat Aug 12 16:22:28 2006
@@ -1,5 +1,5 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
   <include package="jsonserver" file="meta.zcml" />
-  <include package="jsonserver.concatresource" file="meta.zcml" />
+
 </configure>