diff --git a/src/components/SysMenu.vue b/src/components/SysMenu.vue
index dcd83f7..6f11f8a 100644
--- a/src/components/SysMenu.vue
+++ b/src/components/SysMenu.vue
@@ -125,11 +125,7 @@ const list = reactive([
   },
   {
     show: true,
-<<<<<<< HEAD
-    path: '/sysManage/alarmRecord',
-=======
     path: '/alarmInfo/list',
->>>>>>> origin/develop
     label: '报警管理',
     icon: 'alarm_on',
   },