merge

src/views/projectManage/taskList/components/scheduleList.vue

@@ -66,13 +66,8 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-<<<<<<< HEAD
-          <el-button type="text" size="medium" @click="editSchedule(scope.row)">编辑</el-button>
-          <el-button type="text" size="medium" @click="deleteSchedule(scope.row)">删除</el-button>
-=======
           <el-button v-if="scope.row.isScheduleLocked === 0" type="text" size="small" @click="editSchedule(scope.row)">编辑</el-button>
           <el-button v-if="scope.row.isScheduleLocked === 0" type="text" size="small" @click="deleteSchedule(scope.row)">删除</el-button>
->>>>>>> bc64bc920d14ed654a6dad6f95e72aada43855c4
         </template>
       </el-table-column>