魔墙：删除合并信息

2023-03-08 11:58:05 +08:00 · 2023-03-08 11:58:05 +08:00 · 8583f77627
parent 0f6972635c
commit 8583f77627
1 changed files with 0 additions and 4 deletions
--- a/src/components/ControlPanelDialog.vue
+++ b/src/components/ControlPanelDialog.vue
@ -1494,10 +1494,6 @@ export default defineComponent({
        });
      }
      if(a.length==0){
-<<<<<<< HEAD
-=======
-        console.log(123)
->>>>>>> b2f88140799e0867e7ee99aaa09fe88f841aa673
        test_monitor_list.value.forEach((ele) => {
          ele.isHide = false;
        })