[Zodb-checkins] CVS: Zope3/src/zodb - conflict.py:1.11

[Barry Warsaw]

Update of /cvs-repository/Zope3/src/zodb
In directory cvs.zope.org:/tmp/cvs-serv25870

Modified Files:
	conflict.py 
Log Message:
_resolve(): Should return both the data and refs, which just means we
should not unpack the tuple returned by writer.getState().


=== Zope3/src/zodb/conflict.py 1.10 => 1.11 ===
--- Zope3/src/zodb/conflict.py:1.10	Fri Mar 14 12:18:52 2003
+++ Zope3/src/zodb/conflict.py	Fri Mar 14 15:43:31 2003
@@ -185,4 +185,4 @@
 
         writer = ResolvedObjectWriter()
         obj = ResolvedObjectAdapter(get_self(resolve), resolved)
-        return writer.getState(obj)[0]
+        return writer.getState(obj)