This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.3-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.1.3-prepare by this push:
new 664b17ae96 update code clean
664b17ae96 is described below
commit 664b17ae96d51a654249332cf9914e506c5ef7e5
Author: zhuangchong <[email protected]>
AuthorDate: Tue Jan 3 19:03:06 2023 +0800
update code clean
---
dolphinscheduler-ui/src/store/project/types.ts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/dolphinscheduler-ui/src/store/project/types.ts
b/dolphinscheduler-ui/src/store/project/types.ts
index 71073c8e89..8c2dae5162 100644
--- a/dolphinscheduler-ui/src/store/project/types.ts
+++ b/dolphinscheduler-ui/src/store/project/types.ts
@@ -18,9 +18,6 @@
import type { EditWorkflowDefinition } from
'@/views/projects/workflow/components/dag/types'
import type { IOption } from '@/components/form/types'
-<<<<<<< HEAD
-type ProgramType = 'JAVA' | 'SCALA' | 'PYTHON' | 'SQL'
-=======
type TaskExecuteType = 'STREAM' | 'BATCH'
type TaskType =
@@ -62,7 +59,6 @@ type TaskType =
type ProgramType = 'JAVA' | 'SCALA' | 'PYTHON'
->>>>>>> 4e09bacb1 ([Fix-13248][UI] Ironed out the issue with failing to query
task instances by some state of task. (#13251))
type DependentResultType = {
[key: string]: 'SUCCESS' | 'FAILURE'
}
