From 01214077d3b6a64053d1e22de218d9d0ba6e1d03 Mon Sep 17 00:00:00 2001
From: jialin <jialinkuang@126.com>
Date: Tue, 29 Oct 2024 17:38:15 +0800
Subject: [PATCH] fix: rebase main

---
 src/layouts/rightRender.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/layouts/rightRender.tsx b/src/layouts/rightRender.tsx
index 8637f8f2..333521d7 100644
--- a/src/layouts/rightRender.tsx
+++ b/src/layouts/rightRender.tsx
@@ -108,10 +108,6 @@ export const getRightRenderContent = (opts: {
       : 'user-menu-container',
     mode: 'vertical',
     expandIcon: false,
-<<<<<<< HEAD
-    // inlineCollapsed: collapsed,
-=======
->>>>>>> 7174170 (refactor: playground rerank layout)
     triggerSubMenuAction: 'hover',
     items: [
       {