removed conflicts

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
sumukhswamy · Feb 20, 2025 · 76cbbb2 · 76cbbb2
1 parent a07fd91
commit 76cbbb2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/public/components/SQLPage/sql_catalog_tree/s3_tree.tsx b/public/components/SQLPage/sql_catalog_tree/s3_tree.tsx
@@ -270,14 +270,10 @@ export const S3Tree = ({
     if (status === AsyncQueryStatus.Success) {
       refreshDatabasesinTree();
       setIsTreeLoading({ status: false, message: '' });
-<<<<<<< HEAD
-      const dsCache = catalogCacheRefs.CatalogCacheManager!.getOrCreateDataSource(dataSource, dataSourceMDSId);
-=======
       const dsCache = catalogCacheRefs.CatalogCacheManager!.getOrCreateDataSource(
         dataSource,
         dataSourceMDSId
       );
->>>>>>> eebe626 ([Bug]Side tree flyout fix in async operations (#448))
       if (dsCache.status === CachedDataSourceStatus.Updated) {
         const databases = dsCache.databases.map((db) => db.name);
         setTreeData(loadTreeItem(databases, TREE_ITEM_DATABASE_NAME_DEFAULT_NAME));