fix conflict resolution

2024-08-27 13:22:24 +12:00 · 2024-08-27 13:22:24 +12:00 · e2ec1c46f8
parent df7d7dc209
commit e2ec1c46f8
1 changed files with 0 additions and 4 deletions
--- a/plugins/woocommerce-admin/client/settings/settings-slots.js
+++ b/plugins/woocommerce-admin/client/settings/settings-slots.js
@ -1,11 +1,7 @@
 /**
 * External dependencies
 */
-<<<<<<< HEAD
-import { render, createRoot, useContext } from '@wordpress/element';
-=======
 import { createRoot } from '@wordpress/element';
->>>>>>> trunk
 import { createSlotFill, SlotFillProvider } from '@wordpress/components';
 import { PluginArea } from '@wordpress/plugins';