diff options
| author | kimdahey <claire_kim1@brown.edu> | 2019-09-21 15:43:22 -0400 |
|---|---|---|
| committer | kimdahey <claire_kim1@brown.edu> | 2019-09-21 15:43:22 -0400 |
| commit | 0b0789816e8a996b32d92e305da84b5922a49f40 (patch) | |
| tree | e0a5ae13305c3f4d20413c5930f8281741fade98 /src/client/views/presentationview | |
| parent | f520d5a821b515e0c216f055e93f0549bd6733a9 (diff) | |
| parent | 1d5dc3eb4095cea017412de9519b8eaee979c16c (diff) | |
merge conflicts
Diffstat (limited to 'src/client/views/presentationview')
| -rw-r--r-- | src/client/views/presentationview/PresentationElement.tsx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/client/views/presentationview/PresentationElement.tsx b/src/client/views/presentationview/PresentationElement.tsx index 7be44faf6..126d62c52 100644 --- a/src/client/views/presentationview/PresentationElement.tsx +++ b/src/client/views/presentationview/PresentationElement.tsx @@ -366,6 +366,7 @@ export default class PresentationElement extends React.Component<PresentationEle zoomToScale={emptyFunction} getScale={returnOne} ContainingCollectionView={undefined} + ContainingCollectionDoc={undefined} ContentScaling={scale} /> <div style={{ |