[incubator-devlake] branch release-v0.17 updated: fix: Fix bad merge conflict resolution (#5296)

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

abeizn pushed a commit to branch release-v0.17
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/release-v0.17 by this push:
     new 14fddd1fe fix: Fix bad merge conflict resolution (#5296)
14fddd1fe is described below

commit 14fddd1fe1e92bd532263914c9c4db464e0d55e6
Author: Camille Teruel <ca...@gmail.com>
AuthorDate: Fri May 26 14:09:13 2023 +0200

    fix: Fix bad merge conflict resolution (#5296)
    
    Co-authored-by: Camille Teruel <ca...@meri.co>
---
 backend/python/plugins/azuredevops/azuredevops/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/python/plugins/azuredevops/azuredevops/models.py b/backend/python/plugins/azuredevops/azuredevops/models.py
index 0f432b9d3..87c2c423e 100644
--- a/backend/python/plugins/azuredevops/azuredevops/models.py
+++ b/backend/python/plugins/azuredevops/azuredevops/models.py
@@ -129,8 +129,8 @@ class Job(ToolModel, table=True):
     name: str
     startTime: datetime.datetime
     finishTime: datetime.datetime
-    state: State
-    result: Result
+    state: JobState
+    result: JobResult
 
     @classmethod
     def migrate(self, session: Session):