Skip to content

Commit

Permalink
fix merge conflict errors
Browse files Browse the repository at this point in the history
  • Loading branch information
chad1008 committed Jan 22, 2024
1 parent ec1387a commit 3eaaa01
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions packages/editor/src/components/list-view-sidebar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export default function ListViewSidebar() {
>
<div className="edit-post-editor__document-overview-panel__header">
<Button
className="edit-post-editor__document-overview-panel__close-button"
className="editor-list-view-sidebar__close-button"
icon={ closeSmall }
label={ __( 'Close' ) }
onClick={ closeListView }
Expand All @@ -148,19 +148,15 @@ export default function ListViewSidebar() {

<Tabs.TabPanel
ref={ listViewContainerRef }
className="edit-post-editor__list-view-container"
className="editor-list-view-sidebar__list-view-container"
tabId="list-view"
focusable={ false }
>
<div className="edit-post-editor__list-view-panel-content">
<div className="editor-list-view-sidebar__list-view-panel-content">
<ListView dropZoneElement={ dropZoneElement } />
</div>
</Tabs.TabPanel>
<Tabs.TabPanel
className="editor-list-view-sidebar__list-view-container"
tabId="outline"
focusable={ false }
>
<Tabs.TabPanel tabId="outline" focusable={ false }>
<ListViewOutline />
</Tabs.TabPanel>
</Tabs>
Expand Down

0 comments on commit 3eaaa01

Please sign in to comment.