fix:冲突

src/views/home/Index.vue

@@ -51,11 +51,7 @@ export default {
   data() {
     return {
       loading: false,
-<<<<<<< HEAD
-      isShowHd: false,//切换华电
-=======
-      isShowHd: false, //true 则展示华电的菜单样式，false 则展示默认的左侧边栏菜单
->>>>>>> 055ee205f9e0fd151c91a7107661ff86dcdd6a2c
+      isShowHd: false, //切换华电
     };
   },
   methods: {