diff options
| author | Melissa Zhang <mzhang19096@gmail.com> | 2020-07-07 10:24:22 -0700 |
|---|---|---|
| committer | Melissa Zhang <mzhang19096@gmail.com> | 2020-07-07 10:24:22 -0700 |
| commit | 638879c606302f809ba4fcdc431a289a8bc01c2e (patch) | |
| tree | fb120d90ca99353f6a75dcd403080eaf4b4691e3 /src/client/views/collections | |
| parent | ef00832c86c1f357757f16917f5caea05e7deab7 (diff) | |
merge with master
Diffstat (limited to 'src/client/views/collections')
| -rw-r--r-- | src/client/views/collections/CollectionLinearView.tsx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionLinearView.tsx b/src/client/views/collections/CollectionLinearView.tsx index f44c3db68..c370415be 100644 --- a/src/client/views/collections/CollectionLinearView.tsx +++ b/src/client/views/collections/CollectionLinearView.tsx @@ -170,14 +170,10 @@ export class CollectionLinearView extends CollectionSubView(LinearDocument) { }} onPointerDown={e => e.stopPropagation()} > <span className="bottomPopup-text" > -<<<<<<< HEAD - Creating link from: {(DocumentLinksButton.AnnotationId ? "Annotation in " : "")} {DocumentLinksButton.StartLink.title} </span> -======= Creating link from: {DocumentLinksButton.StartLink.title} </span> <span className="bottomPopup-descriptions" onClick={this.changeDescriptionSetting} > Labels: {LinkDescriptionPopup.showDescriptions ? LinkDescriptionPopup.showDescriptions : "ON"} </span> ->>>>>>> 3f704ee2941fef77dd0eafebeb0a6ffb0a946a8b <span className="bottomPopup-exit" onClick={this.exitLongLinks} >Exit</span> |