From b188b79834a32f949ba479e097dc8fb7ba0c5a8b Mon Sep 17 00:00:00 2001
From: Seth Samuel <sethsamuel@gmail.com>
Date: Tue, 16 Aug 2022 14:15:20 +0100
Subject: [PATCH] merge conflict hopefully fixed

---
 .../editor/src/lib/remix-ui-editor.tsx        |  2 +-
 .../src/lib/components/file-render.tsx        | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
index 2f7ba40384..716c289046 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -617,4 +617,4 @@ export const EditorUI = (props: EditorUIProps) => {
   )
 }
 
-export default EditorUI
+export default EditorUI
\ No newline at end of file
diff --git a/libs/remix-ui/workspace/src/lib/components/file-render.tsx b/libs/remix-ui/workspace/src/lib/components/file-render.tsx
index 814715ee42..d535a0ca89 100644
--- a/libs/remix-ui/workspace/src/lib/components/file-render.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/file-render.tsx
@@ -82,9 +82,14 @@ export const FileRender = (props: RenderFileProps) => {
         iconX='pr-3 fa fa-folder'
         iconY='pr-3 fa fa-folder-open'
         key={`${file.path + props.index}`}
-        label={<Draggable isDraggable={props.focusEdit.element!==null} file={file} expandedPath={props.expandPath} handleClickFolder={props.handleClickFolder}> 
-        <FileLabel fileDecorations={props.fileDecorations} file={file} focusEdit={props.focusEdit} editModeOff={props.editModeOff} />
-        </Draggable>}
+        label={<>
+          <div className="d-flex flex-row">
+            <Draggable isDraggable={props.focusEdit.element!==null} file={file} expandedPath={props.expandPath} handleClickFolder={props.handleClickFolder}> 
+              <FileLabel fileDecorations={props.fileDecorations} file={file} focusEdit={props.focusEdit} editModeOff={props.editModeOff} />
+            </Draggable>
+            <FileDecorationIcons file={file} fileDecorations={props.fileDecorations}/>
+            </div>
+          </>}
         onClick={handleFolderClick}
         onContextMenu={handleContextMenu}
         labelClass={labelClass}
@@ -122,13 +127,13 @@ export const FileRender = (props: RenderFileProps) => {
         id={`treeViewItem${file.path}`}
         key={`treeView${file.path}`}
         label={
-          <>
-            <div className="d-flex flex-row">
-              <Draggable isDraggable={props.focusEdit.element!==null} file={file} expandedPath={props.expandPath} handleClickFolder={props.handleClickFolder}>
-                <FileLabel file={file} fileDecorations={props.fileDecorations} focusEdit={props.focusEdit} editModeOff={props.editModeOff} />
-              </Draggable>
-              <FileDecorationIcons file={file} fileDecorations={props.fileDecorations}/>
-            </div>
+        <>
+        <div className="d-flex flex-row">
+          <Draggable isDraggable={props.focusEdit.element!==null} file={file} expandedPath={props.expandPath} handleClickFolder={props.handleClickFolder}>
+              <FileLabel fileDecorations={props.fileDecorations} file={file} focusEdit={props.focusEdit} editModeOff={props.editModeOff} />
+            </Draggable>
+            <FileDecorationIcons file={file} fileDecorations={props.fileDecorations}/>
+          </div>
           </>
         }
         onClick={handleFileClick}