fix: 解决冲突报错

src/layouts/HN.less

@@ -124,11 +124,7 @@
       left: 20px;
       margin: 0 1px !important;
     }
-<<<<<<< HEAD
     .@{ant-prefix}-menu-item-children :global .@{ant-prefix}-tabs-nav-operations .ant-tabs-nav-more {
-=======
-    .@{ant-prefix}-menu-item-children :global .@{ant-prefix}-tabs-nav-operations .@{ant-prefix}-tabs-nav-more {
->>>>>>> fa72e0e678feefdb1d74b7174a4a181986a47919
       margin-right: 0px !important;
     }
     .@{ant-prefix}-menu-item-children :global(.@{ant-prefix}-tabs-ink-bar) {
@@ -273,7 +269,6 @@
         stroke: @hn-greenColor !important;
       }
     }
-<<<<<<< HEAD
     .@{ant-prefix}-menu.@{ant-prefix}-menu-dark
       .@{ant-prefix}-menu-submenu-title
       .@{ant-prefix}-menu-submenu-arrow::before {
@@ -282,12 +277,6 @@
     .@{ant-prefix}-menu.@{ant-prefix}-menu-dark
       .@{ant-prefix}-menu-submenu-title
       .@{ant-prefix}-menu-submenu-arrow::after {
-=======
-    .@{ant-prefix}-menu-submenu-arrow::before{
-      background: #7a7a7a !important;
-    }
-    .@{ant-prefix}-menu-submenu-arrow::after {
->>>>>>> fa72e0e678feefdb1d74b7174a4a181986a47919
       background: #7a7a7a !important;
     }
     .@{ant-prefix}-menu-dark .@{ant-prefix}-menu-inline.@{ant-prefix}-menu-sub {