Commit 05f7e3e6 authored by Jean-Paul Smets's avatar Jean-Paul Smets

conflict solved


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@316 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1f8d5cb7
...@@ -29,12 +29,8 @@ ...@@ -29,12 +29,8 @@
from Globals import InitializeClass from Globals import InitializeClass
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
from Products.ERP5.Document.AssortedResource import AssortedResource as ERP5AssortedResource from Products.ERP5.Document.AssortedResource import AssortedResource as ERP5AssortedResource
from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
from AccessControl import ClassSecurityInfo
class AssortedResource(ERP5AssortedResource): class AssortedResource(ERP5AssortedResource):
""" """
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment