conflict solved

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

product/Coramy/Document/AssortedResource.py

@@ -29,12 +29,8 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 
-from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
-
-
 from Products.ERP5.Document.AssortedResource import AssortedResource as ERP5AssortedResource
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
-from AccessControl import ClassSecurityInfo
 
 class AssortedResource(ERP5AssortedResource):
     """