conflict fix

libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@@ -396,84 +396,6 @@ export function Workspace () {
               />
             </div>
           }
-            { !(global.fs.browser.isRequestingWorkspace || 
-              global.fs.browser.isRequestingCloning) &&
-              (global.fs.mode === 'browser') && (currentWorkspace !== NO_WORKSPACE) && 
-              <div className='h-100 remixui_treeview' data-id='filePanelFileExplorerTree'>
-                <FileExplorer
-                  name={currentWorkspace}
-                  menuItems={['createNewFile', 'createNewFolder', 'publishToGist', canUpload ? 'uploadFile' : '']}
-                  contextMenuItems={global.fs.browser.contextMenu.registeredMenuItems}
-                  removedContextMenuItems={global.fs.browser.contextMenu.removedMenuItems}
-                  files={global.fs.browser.files}
-                  fileState={global.fs.browser.fileState}
-                  expandPath={global.fs.browser.expandPath}
-                  focusEdit={global.fs.focusEdit}
-                  focusElement={global.fs.focusElement}
-                  dispatchCreateNewFile={global.dispatchCreateNewFile}
-                  modal={global.modal}
-                  dispatchCreateNewFolder={global.dispatchCreateNewFolder}
-                  readonly={global.fs.readonly}
-                  toast={global.toast}
-                  dispatchDeletePath={global.dispatchDeletePath}
-                  dispatchRenamePath={global.dispatchRenamePath}
-                  dispatchUploadFile={global.dispatchUploadFile}
-                  dispatchCopyFile={global.dispatchCopyFile}
-                  dispatchCopyFolder={global.dispatchCopyFolder}
-                  dispatchPublishToGist={global.dispatchPublishToGist}
-                  dispatchRunScript={global.dispatchRunScript}
-                  dispatchEmitContextMenuEvent={global.dispatchEmitContextMenuEvent}
-                  dispatchHandleClickFile={global.dispatchHandleClickFile}
-                  dispatchSetFocusElement={global.dispatchSetFocusElement}
-                  dispatchFetchDirectory={global.dispatchFetchDirectory}
-                  dispatchRemoveInputField={global.dispatchRemoveInputField}
-                  dispatchAddInputField={global.dispatchAddInputField}
-                  dispatchHandleExpandPath={global.dispatchHandleExpandPath}
-                  dispatchMoveFile={global.dispatchMoveFile}
-                  dispatchMoveFolder={global.dispatchMoveFolder}
-                />
-              </div>
-            }
-            {
-              global.fs.localhost.isRequestingLocalhost ? <div className="text-center py-5"><i className="fas fa-spinner fa-pulse fa-2x"></i></div>
-                : <div className='h-100 filesystemexplorer remixui_treeview'>
-                { global.fs.mode === 'localhost' && global.fs.localhost.isSuccessfulLocalhost &&
-                  <FileExplorer
-                    name='localhost'
-                    menuItems={['createNewFile', 'createNewFolder']}
-                    contextMenuItems={global.fs.localhost.contextMenu.registeredMenuItems}
-                    removedContextMenuItems={global.fs.localhost.contextMenu.removedMenuItems}
-                    files={global.fs.localhost.files}
-                    fileState={[]}
-                    expandPath={global.fs.localhost.expandPath}
-                    focusEdit={global.fs.focusEdit}
-                    focusElement={global.fs.focusElement}
-                    dispatchCreateNewFile={global.dispatchCreateNewFile}
-                    modal={global.modal}
-                    dispatchCreateNewFolder={global.dispatchCreateNewFolder}
-                    readonly={global.fs.readonly}
-                    toast={global.toast}
-                    dispatchDeletePath={global.dispatchDeletePath}
-                    dispatchRenamePath={global.dispatchRenamePath}
-                    dispatchUploadFile={global.dispatchUploadFile}
-                    dispatchCopyFile={global.dispatchCopyFile}
-                    dispatchCopyFolder={global.dispatchCopyFolder}
-                    dispatchPublishToGist={global.dispatchPublishToGist}
-                    dispatchRunScript={global.dispatchRunScript}
-                    dispatchEmitContextMenuEvent={global.dispatchEmitContextMenuEvent}
-                    dispatchHandleClickFile={global.dispatchHandleClickFile}
-                    dispatchSetFocusElement={global.dispatchSetFocusElement}
-                    dispatchFetchDirectory={global.dispatchFetchDirectory}
-                    dispatchRemoveInputField={global.dispatchRemoveInputField}
-                    dispatchAddInputField={global.dispatchAddInputField}
-                    dispatchHandleExpandPath={global.dispatchHandleExpandPath}
-                    dispatchMoveFile={global.dispatchMoveFile}
-                    dispatchMoveFolder={global.dispatchMoveFolder}
-                  />
-                }
-              </div>
-            }
->>>>>>> 1a3a8ea0e (better colors for create workspace modal)
           </div>
         </div>
       </div>