diff options
| author | kimdahey <claire_kim1@brown.edu> | 2019-08-29 14:32:53 -0400 |
|---|---|---|
| committer | kimdahey <claire_kim1@brown.edu> | 2019-08-29 14:32:53 -0400 |
| commit | 8e2e2c1126086cbc87432bb0466205f892d8ae98 (patch) | |
| tree | d28a6721bcc392906a0ebd091c4acd11ff4747c0 /src/client/views/collections/CollectionDockingView.tsx | |
| parent | 116c17c1e4ccf189d770d170d07a6bfbf95ca4e1 (diff) | |
| parent | 22a5999626b11cf75cafbcd421601e668438f6ad (diff) | |
fix merge conflicts
Diffstat (limited to 'src/client/views/collections/CollectionDockingView.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionDockingView.tsx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx index dc0cbda0b..95f94875c 100644 --- a/src/client/views/collections/CollectionDockingView.tsx +++ b/src/client/views/collections/CollectionDockingView.tsx @@ -636,7 +636,6 @@ export class DockedFrameRenderer extends React.Component<DockedFrameProps> { PanelHeight={this.panelHeight} ScreenToLocalTransform={this.ScreenToLocalTransform} renderDepth={0} - selectOnLoad={false} parentActive={returnTrue} whenActiveChanged={emptyFunction} focus={emptyFunction} |