解决冲突

deaa7c8d · 莫晓莉 · deeb3ba2 · deaa7c8d
Commit deaa7c8d authored Apr 06, 2021 by 莫晓莉
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
+0 -4

No files found.
--- a/src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
+++ b/src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
@@ -1462,11 +1462,7 @@ export default {
          //插入、更新
          this.InsertOrUpdateVisible = !this.InsertOrUpdateVisible;
          return;
-<<<<<<< HEAD
        } else if (cell.ids == "step12") {
-=======
-        } else if (cell.ids == "step11") {
->>>>>>> 85d62a150cdd3fb59b3a9d06d747f1bd21d9ab57
          //删除
          this.deleteVisible = !this.deleteVisible;
          return;