Commit 2fd1f932 authored by Gintautas Miliauskas's avatar Gintautas Miliauskas

Removed trailing whitespace.

parent bbd6d73e
......@@ -87,7 +87,7 @@ def persistent_id(object):
if getattr(object, '__class__', 0) is not PersistentReference:
return None
return object.data
_unresolvable = {}
def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
committedData=''):
......@@ -107,7 +107,7 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
else:
klass = meta
newargs = ()
if klass in _unresolvable:
return 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