merge conflicts

[arvados-workbench2.git] / src / views / workbench / workbench.tsx

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 934fe531724a2d31e9f296830c09387710c5b9b8..b1e7cd78659efe4cfa88239adaa591d7cda4813b 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -31,7 +31,7 @@ import { contextMenuActions } from "../../store/context-menu/context-menu-action
 import { SidePanelIdentifiers } from '../../store/side-panel/side-panel-reducer';
 import { ProjectResource } from '../../models/project';
 import { ResourceKind } from '../../models/resource';
-import { ContextMenuHOC, ContextMenuKind } from "../../views-components/context-menu/context-menu";
+import { ContextMenu, ContextMenuKind } from "../../views-components/context-menu/context-menu";
 
 const drawerWidth = 240;
 const appBarHeight = 100;
@@ -193,9 +193,9 @@ export const Workbench = withStyles(styles)(
                                     <Route path="/projects/:id" render={this.renderProjectPanel} />
                                 </Switch>
                             </div>
-                            { user && <DetailsPanel /> }
+                            {user && <DetailsPanel />}
                         </main>
-                        <ContextMenuHOC />
+                        <ContextMenu />
                         <CreateProjectDialog />
                     </div>
                 );