[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/configure.zcml fix botched merge

[Fred L. Drake, Jr.]

Log message for revision 27002:
  fix botched merge


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/configure.zcml


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/configure.zcml
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/configure.zcml	2004-08-11 16:11:54 UTC (rev 27001)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/configure.zcml	2004-08-11 17:35:38 UTC (rev 27002)
@@ -55,18 +55,6 @@
   <include package="zope.app.utility" />  
   <include package="zope.app.principalannotation" />  
 
-<<<<<<< .working
-=======
-  <!-- Utilities -->
-  <include package="zope.app.schema" />
-  <include package="zope.app.uniqueid" />
-
-  <!-- Misc. Service Manager objects -->
-  <!-- Aktari delete - we don't want this
-  <include package="zope.app.module" />
-  -->
-
->>>>>>> .merge-right.r26932
   <!-- Broken-object support -->
   <include package="zope.app.broken" />