fix:合并代码

ruoyi-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -131,22 +131,6 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-<<<<<<< HEAD
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除
-          </el-button>
-=======
           <el-dropdown>
             <el-button type="warning" plain size="small">
               处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -171,7 +155,6 @@
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
->>>>>>> 53e53a68 (修改样式和表格删除)
         </template>
       </el-table-column>
     </el-table>