[Zope-Checkins] CVS: ZODB3/ZODB - ConflictResolution.py:1.11

[Jeremy Hylton]

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

Modified Files:
	ConflictResolution.py 
Log Message:
Remove unused imports.


=== ZODB3/ZODB/ConflictResolution.py 1.10 => 1.11 ===
--- ZODB3/ZODB/ConflictResolution.py:1.10	Wed Aug 14 15:55:39 2002
+++ ZODB3/ZODB/ConflictResolution.py	Wed Aug 14 15:56:04 2002
@@ -13,11 +13,8 @@
 ##############################################################################
 from cStringIO import StringIO
 from cPickle import Unpickler, Pickler
-import sys
 
 from ZODB.POSException import ConflictError
-
-#import traceback
 
 bad_classes = {}