[Zodb-checkins] CVS: ZODB3/ZODB - ConflictResolution.py:1.19

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv9095/ZODB

Modified Files:
	ConflictResolution.py 
Log Message:
Remove unused variable class_tuple.


=== ZODB3/ZODB/ConflictResolution.py 1.18 => 1.19 ===
--- ZODB3/ZODB/ConflictResolution.py:1.18	Mon Dec  9 17:31:19 2002
+++ ZODB3/ZODB/ConflictResolution.py	Thu Oct  2 19:56:55 2003
@@ -38,10 +38,8 @@
     file = StringIO(p)
     unpickler = Unpickler(file)
     unpickler.persistent_load = prfactory.persistent_load
-    class_tuple = unpickler.load()
-    state = unpickler.load()
-    return state
-
+    unpickler.load() # skip the class tuple
+    return unpickler.load()
 
 class PersistentReference: