Skip to content

Commit

Permalink
changes: allow multiple markers with same type
Browse files Browse the repository at this point in the history
  • Loading branch information
le-jeu committed Jan 14, 2022
1 parent 0fa8482 commit bb428b8
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions src/code/model/changes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -385,13 +385,6 @@ export function computeRebaseChanges(
(a.fromPortalId === b.fromPortalId && a.toPortalId === b.toPortalId) ||
(a.fromPortalId === b.toPortalId && a.toPortalId === b.fromPortalId)
);
// use master ID if markers are added at both ends
// note: assume we shouldn't have multiple markers with same type on a portal
unifyAdditions(
masterChanges.markers,
followerChanges.markers,
(a, b) => a.portalId === b.portalId && a.type === b.type
);

const changes = {
props: rebaseDiff(masterChanges.props, followerChanges.props),
Expand Down

0 comments on commit bb428b8

Please sign in to comment.