fix merge conflict

2020-05-18 14:34:44 -04:00 · 2020-05-18 14:34:44 -04:00 · d0c3fb6db0
commit d0c3fb6db0
parent 979242c819
1 changed files with 4 additions and 1 deletions
--- a/platform/viewer/src/routes/Mode/Mode.jsx
+++ b/platform/viewer/src/routes/Mode/Mode.jsx
@ -88,7 +88,10 @@ export default function ModeRoute({
         *  Use it from there instead of passing as a prop here.
         */}
        <DragAndDropProvider>
-          <LayoutComponent {...layoutTemplateData.props} ViewportGridComp={ViewportGridWithDataSource}/>
+          <LayoutComponent
+            {...layoutTemplateData.props}
+            ViewportGridComp={ViewportGridWithDataSource}
+          />
        </DragAndDropProvider>
      </CombinedContextProvider>
      {/*</ToolbarLayoutProvider>*/}