From e2ec1c46f86ef63f515ea2f135ff5719e8d5ca6f Mon Sep 17 00:00:00 2001
From: paul sealock <psealock@gmail.com>
Date: Tue, 27 Aug 2024 13:22:24 +1200
Subject: [PATCH] fix conflict resolution

---
 plugins/woocommerce-admin/client/settings/settings-slots.js | 4 ----
 1 file changed, 4 deletions(-)

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';