erp5.conflictresolver is useful for zeo server (never use it for zeo clients).

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

buildout/software-profiles/erp5-2.12.cfg

@@ -141,6 +141,7 @@ eggs =
   cloudooo
   collective.recipe.supervisor
   collective.recipe.template
+  erp5.conflictresolver
   erp5.recipe.cloudoooinstance
   erp5.recipe.genbt5list
   erp5.recipe.mysqldatabase

buildout/software-profiles/erp5.cfg

@@ -127,6 +127,7 @@ eggs =
   cloudooo
   collective.recipe.supervisor
   collective.recipe.template
+  erp5.conflictresolver
   erp5.recipe.cloudoooinstance
   erp5.recipe.genbt5list
   erp5.recipe.mysqldatabase