diff options
| author | mehekj <mehek.jethani@gmail.com> | 2021-10-07 16:48:33 -0400 |
|---|---|---|
| committer | mehekj <mehek.jethani@gmail.com> | 2021-10-07 16:48:33 -0400 |
| commit | 8ff12370498a99d712adbf442004f13e51e2e381 (patch) | |
| tree | e4ff5763ce28dfefffda320845ebf82fe259f002 /src/client/views/nodes/ComparisonBox.tsx | |
| parent | 11571a4db8907467b1a17d8fe14c80a9e47c6030 (diff) | |
merge conflict fixes
Diffstat (limited to 'src/client/views/nodes/ComparisonBox.tsx')
| -rw-r--r-- | src/client/views/nodes/ComparisonBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/nodes/ComparisonBox.tsx b/src/client/views/nodes/ComparisonBox.tsx index b1aada158..d80fb44cf 100644 --- a/src/client/views/nodes/ComparisonBox.tsx +++ b/src/client/views/nodes/ComparisonBox.tsx @@ -89,7 +89,7 @@ export class ComparisonBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatabl }; const displayDoc = (which: string) => { var whichDoc = Cast(this.dataDoc[which], Doc, null); - //if (whichDoc?.type === DocumentType.MARKER) + if (whichDoc?.type === DocumentType.MARKER) whichDoc = Cast(whichDoc.annotationOn, Doc, null); const targetDoc = Cast(whichDoc.annotationOn, Doc, null) ?? whichDoc; return whichDoc ? <> <DocumentView |