Commit 8bc45008 authored by Sebastien Robin's avatar Sebastien Robin

corrected a bug submitted a few minute ago


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@830 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 83b39fea
...@@ -167,7 +167,7 @@ class Conflict(SyncCode, Implicit): ...@@ -167,7 +167,7 @@ class Conflict(SyncCode, Implicit):
p_sync = getToolByName(self,'portal_synchronizations') p_sync = getToolByName(self,'portal_synchronizations')
return p_sync.getSubscriberDocument(self) return p_sync.getSubscriberDocument(self)
def applySubscriberDocumentPath(self): def applySubscriberDocument(self):
""" """
after a conflict resolution, we have decided after a conflict resolution, we have decided
to keep the local version of this object to keep the local version of this object
......
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