merge

1 files changed, 6 insertions, 0 deletions

diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
index 3c2ccecfc..211c90c29 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
@@ -214,6 +214,7 @@ export class CollectionFreeFormLinksView extends React.Component<CollectionViewP
                         // LinkManager.Instance.linkProxies.push(proxy);
                         LinkManager.Instance.addLinkProxy(proxy);
                     }
+<<<<<<< HEAD
                     uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView} proxyDoc={proxy} />);
 
                     // let proxy = LinkManager.Instance.findLinkProxy(StrCast(u.sourceView.props.Document[Id]), StrCast(u.targetView.props.Document[Id]));
@@ -227,6 +228,11 @@ export class CollectionFreeFormLinksView extends React.Component<CollectionViewP
 
                     // uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView}
                     //     proxyDoc={proxy} addDocTab={this.props.addDocTab} />);
+=======
+                    return match || found;
+                }, false)) {
+                    drawnPairs.push({ a: possiblePair.a, b: possiblePair.b, l: [connection.l] });
+>>>>>>> e9d62f4ca0dbeb57e46239047041a8a04da7b504
                 }
             }
         });