解决冲突

src/components/drawers/AddLive.vue

@@ -455,18 +455,12 @@ async function confirm() {
     throw Error("数据校验不通过")
   });
   if (taskIndex.value === -1) {
-<<<<<<< HEAD
     let list = props.taskList
     list.push(
             {name: formData.value.liveName,
               type: props.type,
               info: {...formData.value}
             })
-    console.log("list:" + list)
-=======
-    const list = props.taskList
-    list.push({name: formData.value.liveName, type: props.type, info: {...formData.value}})
->>>>>>> aa76caecde0cba165ddb01f060970317f34071b3
   } else {
     const data = props.taskList[taskIndex.value]
     data.name = formData.value.liveName