[ZODB-Dev] passing on _p_resolveConflict

[John Belmonte]

Jeremy wrote:
> It should raise ConflictError.  If it returns None, the database wil
> store None as the state of the object.

Hmm, when I went to add this information to 
http://www.zope.org/Members/jim/ZODB/ApplicationLevelConflictResolution, 
I noticed that it already said the following (hidden below the example):

    If the method cannot resolve the changes, then it should return None.

You are sure that's incorrect?


-- 
http:// if   le.o  /