rebase cleanup

WordPress · Nov 28, 2023 · bd758b4 · bd758b4
1 parent fa50250
commit bd758b4
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/lib/compat/wordpress-6.5/rest-api.php b/lib/compat/wordpress-6.5/rest-api.php
@@ -21,7 +21,6 @@ function gutenberg_register_global_styles_revisions_endpoints() {
 add_action( 'rest_api_init', 'gutenberg_register_global_styles_revisions_endpoints' );
 
 /**
-<<<<<<< HEAD
  * Registers additional fields for wp_template and wp_template_part rest api.
  *
  * @access private

diff --git a/packages/block-editor/src/components/block-patterns-list/index.js b/packages/block-editor/src/components/block-patterns-list/index.js
@@ -6,11 +6,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-<<<<<<< HEAD
 import { useEffect, useState, forwardRef } from '@wordpress/element';
-=======
-import { useState, forwardRef } from '@wordpress/element';
->>>>>>> 8bc5711934 (not functional commit - refactor the implementation)
 import {
 	VisuallyHidden,
 	Tooltip,

diff --git a/packages/edit-site/src/components/editor/index.js b/packages/edit-site/src/components/editor/index.js
@@ -187,7 +187,6 @@ export default function Editor( { listViewToggleElement, isLoading } ) {
 	);
 
 	const settings = useSpecificEditorSettings();
-
 	const isReady =
 		! isLoading &&
 		( ( postWithTemplate && !! contextPost && !! editedPost ) ||