diff --git a/plugins/woocommerce-admin/client/settings/settings-slots.js b/plugins/woocommerce-admin/client/settings/settings-slots.js index 80526aa9167..4c30728e588 100644 --- 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';