feat(*): 修复重复

src/layout/menuCom.vue

@@ -104,6 +104,18 @@ const getMenuTitle = (item) => {
     width: 16px;
     // height: 18px;
     margin-right: 5px;
+<<<<<<< HEAD
+=======
+  }
+}
+
+
+.is-active {
+  color: #fff !important;
+  background: #03a1b3 !important;
+  span {
+    color: #fff !important;
+>>>>>>> 1ad6a24f7b192e495e1c4235e6fd952843486a6c
   }
 }