[Zope-Checkins] CVS: Zope3/lib/python/ZODB - ConflictResolution.py:1.11

[Jeremy Hylton]

Update of /cvs-repository/Zope3/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv12315

Modified Files:
	ConflictResolution.py 
Log Message:
Get ConflictError from Transaction


=== Zope3/lib/python/ZODB/ConflictResolution.py 1.10 => 1.11 ===
 from cPickle import Unpickler, Pickler
 
-from ZODB.POSException import ConflictError
+from Transaction.Exceptions import ConflictError
 
 bad_classes={}
 def bad_class(class_tuple):