Commit 7ef1ee9c authored by Nicolas Delaby's avatar Nicolas Delaby

Typo: s/tabs/space/

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30130 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b76073ab
......@@ -65,11 +65,11 @@ class ERP5DocumentConduit(ERP5Conduit):
elif subnode.xpath('name()') in self.XUPDATE_DEL:
conflict_list += conduit.deleteNode(xml=sub_xupdate, object=object,
force=force, simulate=simulate,
reset=reset, **kw)
reset=reset, **kw)
elif subnode.xpath('name()') in self.XUPDATE_UPDATE:
conflict_list += conduit.updateNode(xml=sub_xupdate, object=object,
force=force, simulate=simulate,
reset=reset, **kw)
reset=reset, **kw)
return conflict_list
......
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