[Zodb-checkins] CVS: Zope/lib/python/ZODB - ConflictResolution.py:1.8.16.3

[Jeremy Hylton]

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

Modified Files:
      Tag: Zope-2_5-branch
	ConflictResolution.py 
Log Message:
Add missing import of sys


=== Zope/lib/python/ZODB/ConflictResolution.py 1.8.16.2 => 1.8.16.3 ===
--- Zope/lib/python/ZODB/ConflictResolution.py:1.8.16.2	Wed Aug 14 18:45:18 2002
+++ Zope/lib/python/ZODB/ConflictResolution.py	Fri Oct  4 16:29:21 2002
@@ -13,6 +13,7 @@
 ##############################################################################
 from cStringIO import StringIO
 from cPickle import Unpickler, Pickler
+import sys
 
 from ZODB.POSException import ConflictError
 import zLOG