Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class ConflictResolutionStrategy(Enum):
between similar or contained entities.
REMOVE_INTERSECTIONS: Effectively resolves both intersection conflicts
among entities and default strategy conflicts.
NONE: No conflict resolution will be performed.
"""

MERGE_SIMILAR_OR_CONTAINED = "merge_similar_or_contained"
Expand Down