Import ConflictError. This was forgoten in my previous patch.

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

product/ERP5Catalog/CatalogTool.py

@@ -26,6 +26,7 @@
 #
 ##############################################################################
 
+from ZODB.POSException import ConflictError
 from Products.CMFCore.CatalogTool import CatalogTool as CMFCoreCatalogTool
 from Products.ZSQLCatalog.ZSQLCatalog import ZCatalog
 from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery