From 23f3b410075a0cd988e6e83f922cc53a1d527b7c Mon Sep 17 00:00:00 2001 From: Andrei Draganescu Date: Tue, 28 Nov 2023 14:26:57 +0200 Subject: [PATCH] rebase cleanup --- lib/compat/wordpress-6.5/rest-api.php | 1 - .../block-editor/src/components/block-patterns-list/index.js | 4 ---- packages/edit-site/src/components/editor/index.js | 1 - 3 files changed, 6 deletions(-) diff --git a/lib/compat/wordpress-6.5/rest-api.php b/lib/compat/wordpress-6.5/rest-api.php index 883df033d55d3..f36e1ec88a8ce 100644 --- 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 index beee58afcd876..c79d6927c00f0 100644 --- 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 index b4300e2702701..afae1b362ee99 100644 --- a/packages/edit-site/src/components/editor/index.js +++ b/packages/edit-site/src/components/editor/index.js @@ -186,7 +186,6 @@ export default function Editor( { isLoading } ) { ); const settings = useSpecificEditorSettings(); - const isReady = ! isLoading && ( ( postWithTemplate && !! contextPost && !! editedPost ) ||