From 28971834d1c0681dfa2e298c3861b846a729e5c4 Mon Sep 17 00:00:00 2001
From: Hailong Cui <ihailong@amazon.com>
Date: Sun, 21 Jul 2024 09:09:42 +0800
Subject: [PATCH] fix merge conflicts

Signed-off-by: Hailong Cui <ihailong@amazon.com>
---
 src/core/public/index.ts                         | 2 --
 src/plugins/workspace/common/constants.ts        | 2 --
 src/plugins/workspace/opensearch_dashboards.json | 2 +-
 src/plugins/workspace/public/plugin.ts           | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index 002e1df37846..8c387361a9ca 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -76,7 +76,6 @@ import {
   PersistedLog,
   NavGroupItemInMap,
   fulfillRegistrationLinksToChromeNavLinks,
-  PersistedLog,
 } from './chrome';
 import { FatalErrorsSetup, FatalErrorsStart, FatalErrorInfo } from './fatal_errors';
 import { HttpSetup, HttpStart } from './http';
@@ -380,7 +379,6 @@ export {
   PersistedLog,
   NavGroupItemInMap,
   fulfillRegistrationLinksToChromeNavLinks,
-  PersistedLog,
 };
 
 export { __osdBootstrap__ } from './osd_bootstrap';
diff --git a/src/plugins/workspace/common/constants.ts b/src/plugins/workspace/common/constants.ts
index 6cb0a00ed72a..9fef78152d8d 100644
--- a/src/plugins/workspace/common/constants.ts
+++ b/src/plugins/workspace/common/constants.ts
@@ -185,5 +185,3 @@ export const WORKSPACE_USE_CASES = Object.freeze({
 export const MAX_WORKSPACE_PICKER_NUM = 3;
 export const RECENT_WORKSPACES_KEY = 'recentWorkspaces';
 export const CURRENT_USER_PLACEHOLDER = '%me%';
-export const MAX_WORKSPACE_NAME_LENGTH = 25;
-export const RECENT_WORKSPACES_KEY = 'recentWorkspaces';
diff --git a/src/plugins/workspace/opensearch_dashboards.json b/src/plugins/workspace/opensearch_dashboards.json
index 5838d070264f..79dff7504bc5 100644
--- a/src/plugins/workspace/opensearch_dashboards.json
+++ b/src/plugins/workspace/opensearch_dashboards.json
@@ -8,5 +8,5 @@
     "opensearchDashboardsReact"
   ],
   "optionalPlugins": ["savedObjectsManagement","management","dataSourceManagement","contentManagement"],
-  "requiredBundles": ["opensearchDashboardsReact","home"]
+  "requiredBundles": ["opensearchDashboardsReact"]
 }
diff --git a/src/plugins/workspace/public/plugin.ts b/src/plugins/workspace/public/plugin.ts
index 666f8cdde674..9fa09994d28c 100644
--- a/src/plugins/workspace/public/plugin.ts
+++ b/src/plugins/workspace/public/plugin.ts
@@ -47,7 +47,6 @@ import {
 import { recentWorkspaceManager } from './recent_workspace_manager';
 import { toMountPoint } from '../../opensearch_dashboards_react/public';
 import { UseCaseService } from './services/use_case_service';
-import { recentWorkspaceManager } from './recent_workspace_manager';
 import { WorkspaceListCard } from './components/service_card';
 import { HOME_CONTENT_AREAS, HOME_PAGE_ID } from '../../home/public';