Fix merge conflict issue

WordPress · Apr 18, 2023 · 8bcef22 · 8bcef22
1 parent c18891c
commit 8bcef22
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/block-editor/src/components/block-list/content.scss b/packages/block-editor/src/components/block-list/content.scss
@@ -87,7 +87,7 @@
 	.block-editor-block-list__block.is-highlighted ~ .is-multi-selected,
 	&.is-navigate-mode .block-editor-block-list__block.is-selected,
 	& .is-block-moving-mode.block-editor-block-list__block.has-child-selected,
-	.block-editor-block-list__block:not([contenteditable]):not(.hide-block-border):focus { {
+	.block-editor-block-list__block:not([contenteditable]):not(.hide-block-border):focus {
 		outline: none;
 
 		// We're using a pseudo element to overflow placeholder borders