[Zodb-checkins] CVS: Zope/lib/python/ZODB/tests - testFileStorage.py:1.24

[Jeremy Hylton]

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

Modified Files:
	testFileStorage.py 
Log Message:
Forgot to mixin one of the ConflictResolution storages.


=== Zope/lib/python/ZODB/tests/testFileStorage.py 1.23 => 1.24 ===
--- Zope/lib/python/ZODB/tests/testFileStorage.py:1.23	Mon Nov 18 18:17:40 2002
+++ Zope/lib/python/ZODB/tests/testFileStorage.py	Mon Dec  2 16:59:33 2002
@@ -24,6 +24,7 @@
     PackableStorage.PackableStorage,
     Synchronization.SynchronizedStorage,
     ConflictResolution.ConflictResolvingStorage,
+    ConflictResolution.ConflictResolvingTransUndoStorage,
     HistoryStorage.HistoryStorage,
     IteratorStorage.IteratorStorage,
     IteratorStorage.ExtendedIteratorStorage,