[Zodb-checkins] CVS: Zope3/src/zodb/storage - file.py:1.8.4.15

[Jeremy Hylton]

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

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


=== Zope3/src/zodb/storage/file.py 1.8.4.14 => 1.8.4.15 ===
--- Zope3/src/zodb/storage/file.py:1.8.4.14	Wed Mar 12 16:43:16 2003
+++ Zope3/src/zodb/storage/file.py	Wed Mar 12 16:53:48 2003
@@ -155,7 +155,7 @@
 from zodb.interfaces import *
 from zodb.timestamp import TimeStamp, newTimeStamp, timeStampFromTime
 from zodb.lockfile import LockFile
-from zodb.utils import p64, u64, cp, z64
+from zodb.utils import p64, u64, cp
 from zodb.storage.fsindex import fsIndex
 from zodb.storage.interfaces import *