From a0246ef84396545f79fc4a8b21de1a56cbf06aca Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Thu, 20 Jun 2019 11:34:28 -0400
Subject: merge

---
 .../collections/collectionFreeForm/CollectionFreeFormLinksView.tsx  | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx')

diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
index 211c90c29..3c2ccecfc 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
@@ -214,7 +214,6 @@ 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]));
@@ -228,11 +227,6 @@ 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
                 }
             }
         });
-- 
cgit v1.2.3-70-g09d2

