From afde0b905d9c91bccb46fa27f64af5cdce5d0ea9 Mon Sep 17 00:00:00 2001
From: Qxisylolo <qianxisy@amazon.com>
Date: Mon, 23 Dec 2024 13:39:03 +0800
Subject: [PATCH] new resolve conflicts

Signed-off-by: Qxisylolo <qianxisy@amazon.com>
---
 .../public/chrome/ui/header/recent_items.tsx  | 37 +------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/src/core/public/chrome/ui/header/recent_items.tsx b/src/core/public/chrome/ui/header/recent_items.tsx
index 436bcfcaab56..76dc3bcb3410 100644
--- a/src/core/public/chrome/ui/header/recent_items.tsx
+++ b/src/core/public/chrome/ui/header/recent_items.tsx
@@ -11,13 +11,12 @@ import {
   EuiListGroupItem,
   EuiTitle,
   EuiPopoverTitle,
-  EuiButtonEmpty,
   EuiIcon,
   EuiText,
+  EuiButtonEmpty,
   EuiSpacer,
   EuiHeaderSectionItemButtonProps,
   EuiButtonIcon,
-  EuiAvatar,
   EuiRadioGroup,
   EuiTextColor,
   EuiPopover,
@@ -136,49 +135,15 @@ export const RecentItems = ({
       ownFocus={false}
       panelPaddingSize="s"
       button={
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <EuiButtonIcon
-=======
-        <EuiButtonEmpty
-          data-test-subj="preferencesSettingButton"
-          flush="left"
-          size="xs"
->>>>>>> 30e0396b3d (resolve conflicts)
-=======
         <EuiButtonIcon
->>>>>>> c3bc8423c9 (fix/the_UI_of_recent_assets, use icon button)
           color="primary"
           size="xs"
           onClick={() => {
             setIsPreferencesPopoverOpen((IsPreferencesPopoverOpe) => !IsPreferencesPopoverOpe);
           }}
-<<<<<<< HEAD
-<<<<<<< HEAD
-          iconType="managementApp"
-          data-test-subj="preferencesSettingButton"
-        />
-=======
-=======
->>>>>>> c3bc8423c9 (fix/the_UI_of_recent_assets, use icon button)
-        >
-<<<<<<< HEAD
-          {i18n.translate('core.header.recent.preferences', {
-            defaultMessage: 'Preferences',
-          })}
-=======
-          <EuiIcon type="managementApp" />
->>>>>>> 4da93130e3 (resolve conflicts)
-        </EuiButtonEmpty>
-<<<<<<< HEAD
->>>>>>> c24d5bc842 ([Workspace] feat: optimize recent items and filter out items whose workspace is deleted (#8900))
-=======
-=======
           iconType="managementApp"
           data-test-subj="preferencesSettingButton"
         />
->>>>>>> 37971c9b49 (fix/the_UI_of_recent_assets, use icon button)
->>>>>>> c3bc8423c9 (fix/the_UI_of_recent_assets, use icon button)
       }
       isOpen={isPreferencesPopoverOpen}
       anchorPosition="downLeft"