Skip to content

Commit

Permalink
Merge pull request #115 from MauroDataMapper/feature/gh-114-support-f…
Browse files Browse the repository at this point in the history
…or-merge

codeset merge support
  • Loading branch information
pjmonks authored Jun 12, 2024
2 parents 3b9dd3a + 6be15ba commit c74a822
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/core/mdm-merge.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import {
Payload,
Uuid
} from '../mdm-common.model';
import { CodeSetDetail } from '../terminologies/mdm-code-set.model';


/**
* Represents all {@link MultiFacetAwareDomainType} values that can be used for merge operations.
Expand All @@ -35,6 +37,7 @@ export type MergableMultiFacetAwareDomainType =
| MultiFacetAwareDomainType.DataModels
| MultiFacetAwareDomainType.ReferenceDataModels
| MultiFacetAwareDomainType.Terminologies
| MultiFacetAwareDomainType.CodeSets
| MultiFacetAwareDomainType.VersionedFolders;

/**
Expand All @@ -44,6 +47,7 @@ export type MergableCatalogueItem =
| DataModelDetail
| ReferenceDataModelDetail
| TerminologyDetail
| CodeSetDetail
| VersionedFolderDetail;

/**
Expand Down

0 comments on commit c74a822

Please sign in to comment.