diff --git a/rainbowadn/collection/trees/binary/actions/__init__.py b/rainbowadn/collection/trees/binary/actions/__init__.py index 0fabb60..b2d5461 100644 --- a/rainbowadn/collection/trees/binary/actions/__init__.py +++ b/rainbowadn/collection/trees/binary/actions/__init__.py @@ -1,11 +1,11 @@ __all__ = ( 'BinaryAction', 'CompareAction', - 'AddAction', 'RemoveAction', 'ContainsAction', 'SplitAction', 'UnionAction', + 'AddAction', 'RemoveAction', 'ContainsAction', 'SplitAction', 'UnionAction', 'MergeAction', 'Symmetric', 'InnerOuter', 'OuterInner', ) from .binaryaction import BinaryAction from .compareaction import CompareAction -from .stdactions import AddAction, ContainsAction, RemoveAction, SplitAction, UnionAction +from .stdactions import AddAction, ContainsAction, MergeAction, RemoveAction, SplitAction, UnionAction from .symmetric import InnerOuter, OuterInner, Symmetric diff --git a/rainbowadn/collection/trees/binary/actions/stdactions.py b/rainbowadn/collection/trees/binary/actions/stdactions.py index bf62f42..5961af2 100644 --- a/rainbowadn/collection/trees/binary/actions/stdactions.py +++ b/rainbowadn/collection/trees/binary/actions/stdactions.py @@ -6,7 +6,7 @@ from rainbowadn.core import * from .binaryaction import * from .compareaction import * -__all__ = ('AddAction', 'RemoveAction', 'ContainsAction', 'SplitAction', 'UnionAction',) +__all__ = ('AddAction', 'RemoveAction', 'ContainsAction', 'SplitAction', 'UnionAction', 'MergeAction',) TreeType = TypeVar('TreeType') ActiveKeyType = TypeVar('ActiveKeyType')