From d0c3fb6db0d9cf6222c4b9b0aef3e9d60897dd20 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Mon, 18 May 2020 14:34:44 -0400
Subject: [PATCH] fix merge conflict

---
 platform/viewer/src/routes/Mode/Mode.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/viewer/src/routes/Mode/Mode.jsx b/platform/viewer/src/routes/Mode/Mode.jsx
index b9fe165ee..b8499f682 100644
--- 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>*/}