Commit 15648d67 authored by Jeremy Hylton's avatar Jeremy Hylton

Forgot to mixin one of the ConflictResolution storages.

parent b34ad91f
...@@ -24,6 +24,7 @@ class FileStorageTests( ...@@ -24,6 +24,7 @@ class FileStorageTests(
PackableStorage.PackableStorage, PackableStorage.PackableStorage,
Synchronization.SynchronizedStorage, Synchronization.SynchronizedStorage,
ConflictResolution.ConflictResolvingStorage, ConflictResolution.ConflictResolvingStorage,
ConflictResolution.ConflictResolvingTransUndoStorage,
HistoryStorage.HistoryStorage, HistoryStorage.HistoryStorage,
IteratorStorage.IteratorStorage, IteratorStorage.IteratorStorage,
IteratorStorage.ExtendedIteratorStorage, IteratorStorage.ExtendedIteratorStorage,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment