[Zodb-checkins] CVS: Zope3/src/zodb - db.py:1.7.4.3

[Jeremy Hylton]

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

Modified Files:
      Tag: opaque-pickles-branch
	db.py 
Log Message:
Fix merge problem: z64 -> ZERO


=== Zope3/src/zodb/db.py 1.7.4.2 => 1.7.4.3 ===
--- Zope3/src/zodb/db.py:1.7.4.2	Wed Mar 12 16:32:58 2003
+++ Zope3/src/zodb/db.py	Wed Mar 12 16:51:39 2003
@@ -29,7 +29,7 @@
 from zodb.serialize import getDBRoot
 from zodb.ztransaction import Transaction
 from zodb.interfaces import ZERO
-from zodb.utils import z64, Set
+from zodb.utils import Set
 
 from transaction import get_transaction
 from transaction.interfaces import IDataManager