erp5.conflictresolver should not be included in Zope (Zeo) instance eggs.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44536 20353a03-c40f-0410-a6d1-a30d3c3de9de

slapos/software.cfg

@@ -230,6 +230,7 @@ python = python2.6
 eggs =
 # instantiation egg
   ${instance-recipe:name}
+  erp5.conflictresolver
 
 [eggs]
 recipe = zc.recipe.egg
@@ -293,7 +294,6 @@ eggs =
 #    Products.PortalTransforms
 # Dependency for our fork of PortalTransforms
   StructuredText
-  erp5.conflictresolver
 
 # parameterizing the version of the generated python interpreter name by the
 # python section version causes dependency between this egg section and the