解决冲突

src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue

@@ -954,11 +954,7 @@ export default {
 
   data() {
     return {
-<<<<<<< HEAD
       myoutPutFormData:{},
-=======
-   
->>>>>>> 1fa2926e2a1381ccd4e65928c6d2a0eb28fd4f78
       outPutFormData1:{},
       outPutFormData2:{},
       outPutFormData3:{},
@@ -1018,14 +1014,9 @@ export default {
       activeName: "file",
       fieldType: [],
       fieldFormat: [],
-<<<<<<< HEAD
       fields: [
        
       ],
-=======
-  
-      fields: [],
->>>>>>> 1fa2926e2a1381ccd4e65928c6d2a0eb28fd4f78
       engine: [],
 
       // 画布模块