diff options
author | kimdahey <claire_kim1@brown.edu> | 2019-08-23 13:52:41 -0400 |
---|---|---|
committer | kimdahey <claire_kim1@brown.edu> | 2019-08-23 13:52:41 -0400 |
commit | 72ed0bbdb045695a8dcb7d604a9d834b16f424a9 (patch) | |
tree | f6a062b47f255b9f211c4f2b9218bcf2dca15eb2 /src/client/views/nodes/PDFBox.tsx | |
parent | cc6040e717632ae9725c134cd8722813cb1733c2 (diff) | |
parent | 56987012f9690d300b482d8f1b3d83935342322b (diff) |
fixed merge conflicts
Diffstat (limited to 'src/client/views/nodes/PDFBox.tsx')
-rw-r--r-- | src/client/views/nodes/PDFBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/nodes/PDFBox.tsx b/src/client/views/nodes/PDFBox.tsx index 6450cb826..18f82ff47 100644 --- a/src/client/views/nodes/PDFBox.tsx +++ b/src/client/views/nodes/PDFBox.tsx @@ -198,7 +198,7 @@ export class PDFBox extends DocComponent<FieldViewProps, PdfDocument>(PdfDocumen <PDFViewer pdf={this._pdf} url={pdfUrl.url.pathname} active={this.props.active} scrollTo={this.scrollTo} loaded={this.loaded} panY={NumCast(this.props.Document.panY)} Document={this.props.Document} DataDoc={this.props.DataDoc} addDocTab={this.props.addDocTab} setPanY={this.setPanY} - addDocument={this.props.addDocument} + pinToPres={this.props.pinToPres} addDocument={this.props.addDocument} fieldKey={this.props.fieldKey} fieldExtensionDoc={this.fieldExtensionDoc} /> {this.settingsPanel()} </div>); |