othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
dannyrb 2020-05-18 14:34:44 -04:00
parent 979242c819
commit d0c3fb6db0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/viewer/src/routes/Mode/Mode.jsx
View File

@ -88,7 +88,10 @@ export default function ModeRoute({
* Use it from there instead of passing as a prop here. * Use it from there instead of passing as a prop here.
*/} */}
<DragAndDropProvider> <DragAndDropProvider>
<LayoutComponent {...layoutTemplateData.props} ViewportGridComp={ViewportGridWithDataSource}/> <LayoutComponent
{...layoutTemplateData.props}
ViewportGridComp={ViewportGridWithDataSource}
/>
</DragAndDropProvider> </DragAndDropProvider>
</CombinedContextProvider> </CombinedContextProvider>
{/*</ToolbarLayoutProvider>*/} {/*</ToolbarLayoutProvider>*/}