Fix conflict

WordPress · Feb 15, 2024 · 2a3cee5 · 2a3cee5
1 parent d6c82ac
commit 2a3cee5
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
@@ -23,11 +23,8 @@ import useBlockEditorSettings from './use-block-editor-settings';
 import { unlock } from '../../lock-unlock';
 import DisableNonPageContentBlocks from './disable-non-page-content-blocks';
 import NavigationBlockEditingMode from './navigation-block-editing-mode';
-<<<<<<< HEAD
 import { useHideBlocksFromInserter } from './use-hide-bocks-from-inserter';
-=======
 import useCommands from '../commands';
->>>>>>> c390fb54b12 (Editor: Unify the editor commands between post and site editors)
 
 const { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );
 const { PatternsMenuItems } = unlock( editPatternsPrivateApis );