mod: code review (#379)

vesoft-inc · Nov 30, 2022 · 5041ae7 · 5041ae7
1 parent 9a86f5f
commit 5041ae7
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/app/pages/MainPage/Header/HelpMenu/index.tsx b/app/pages/MainPage/Header/HelpMenu/index.tsx
@@ -44,8 +44,6 @@ const HelpMenu = () => {
       </Link>
     },
     {
-<<<<<<< HEAD
-=======
       key: 'feedbackEntrance',
       popupClassName: styles.accountMenu,
       popupOffset: [-35, 20],
@@ -114,7 +112,6 @@ const HelpMenu = () => {
       ]
     },
     {
->>>>>>> 6080d50 (fix: issues (#369))
       key: 'user',
       popupClassName: styles.accountMenu,
       popupOffset: [-35, 20],