Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix conflict resolution

This commit is contained in:
paul sealock 2024-08-27 13:22:24 +12:00
parent df7d7dc209
commit e2ec1c46f8
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/woocommerce-admin/client/settings/settings-slots.js
View File

@ -1,11 +1,7 @@
/** /**
* External dependencies * External dependencies
*/ */
<<<<<<< HEAD
import { render, createRoot, useContext } from '@wordpress/element';
=======
import { createRoot } from '@wordpress/element'; import { createRoot } from '@wordpress/element';
>>>>>>> trunk
import { createSlotFill, SlotFillProvider } from '@wordpress/components'; import { createSlotFill, SlotFillProvider } from '@wordpress/components';
import { PluginArea } from '@wordpress/plugins'; import { PluginArea } from '@wordpress/plugins';