fix: rebase main

2024-11-22 10:00:34 +08:00
parent 1e3957bdd5
commit 01214077d3
1 changed files with 0 additions and 4 deletions
@@ -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: [
      {