From ebca4d734b9dcf63eaf2719c4d222bbb06df22f9 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Date: Wed, 8 Apr 2020 15:58:56 +0800
Subject: [PATCH] frontend conflict resolve

---
 .../pages/dag/_source/formModel/formModel.vue | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
index 4b31fad0bb..6651f2014f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
@@ -333,10 +333,7 @@
         // Task priority
         taskInstancePriority: 'MEDIUM',
         // worker group id
-<<<<<<< HEAD
-        workerGroup: 'default'
-=======
-        workerGroupId: -1,
+        workerGroup: 'default',
         stateList:[
           {
             value: 'success',
@@ -347,7 +344,6 @@
             label: `${i18n.$t('failed')}`
           }
         ]
->>>>>>> remotes/upstream/dev
       }
     },
     /**
@@ -459,13 +455,9 @@
             retryInterval: this.retryInterval,
             timeout: this.timeout,
             taskInstancePriority: this.taskInstancePriority,
-<<<<<<< HEAD
-            workerGroup: this.workerGroup
-=======
-            workerGroupId: this.workerGroupId,
+            workerGroup: this.workerGroup,
             status: this.status,
             branch: this.branch
->>>>>>> remotes/upstream/dev
           },
           fromThis: this
         })
@@ -527,13 +519,9 @@
             retryInterval: this.retryInterval,
             timeout: this.timeout,
             taskInstancePriority: this.taskInstancePriority,
-<<<<<<< HEAD
-            workerGroup: this.workerGroup
-=======
-            workerGroupId: this.workerGroupId,
+            workerGroup: this.workerGroup,
             status: this.status,
             branch: this.branch
->>>>>>> remotes/upstream/dev
           },
           fromThis: this
         })
@@ -675,13 +663,9 @@
           retryInterval: this.retryInterval,
           timeout: this.timeout,
           taskInstancePriority: this.taskInstancePriority,
-<<<<<<< HEAD
-          workerGroup: this.workerGroup
-=======
-          workerGroupId: this.workerGroupId,
+          workerGroup: this.workerGroup,
           successBranch: this.successBranch,
           failedBranch: this.failedBranch
->>>>>>> remotes/upstream/dev
         }
       }
     },