Commit c0442128 authored by Nicolas Delaby's avatar Nicolas Delaby

readd default values for reset flags

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16345 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b64ba4fc
...@@ -128,6 +128,8 @@ class ERP5Conduit(XMLSyncUtilsMixin): ...@@ -128,6 +128,8 @@ class ERP5Conduit(XMLSyncUtilsMixin):
[conflict1,conflict2,...] where conclict1 is of the form : [conflict1,conflict2,...] where conclict1 is of the form :
[object.getPath(),keyword,local_and_actual_value,subscriber_value] [object.getPath(),keyword,local_and_actual_value,subscriber_value]
""" """
reset_local_roles = 1
reset_workflow = 1
conflict_list = [] conflict_list = []
xml = self.convertToXml(xml) xml = self.convertToXml(xml)
if xml is None: if xml is None:
......
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