From 0f40358ccf5566295ca66d1ab4f4e8fbaa197c96 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Thu, 13 Jan 2022 19:03:29 +0100
Subject: [PATCH] changes: allow multiple markers with same type

---
 src/code/model/changes.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/code/model/changes.ts b/src/code/model/changes.ts
index 03a7b67d3..1e88b3838 100644
--- a/src/code/model/changes.ts
+++ b/src/code/model/changes.ts
@@ -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),