Commit 419d147a authored by Nicolas Delaby's avatar Nicolas Delaby

typo

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29488 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 70c1091f
......@@ -189,7 +189,7 @@ class ERP5Conduit(XMLSyncUtilsMixin):
sub_xml = self.getSubObjectXupdate(xml)
#LOG('addNode', DEBUG, 'sub_xml: %s' % str(sub_xml))
# Then do the udpate
conflict_list += self.addNode(xml=sub_xml,object=sub_object,
conflict_list += self.addNode(xml=sub_xml, object=sub_object,
previous_xml=sub_previous_xml, force=force,
simulate=simulate, reset=reset, **kw)['conflict_list']
elif (xml.xpath('local-name()') == self.history_tag \
......
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