From 57c7b46c6d70042bf125c04b542d169a46401e82 Mon Sep 17 00:00:00 2001
From: Nuvole <jon-lee@sjtu.edu.cn>
Date: Sun, 27 Oct 2024 22:51:54 +0800
Subject: [PATCH] feat: merge conflict

---
 joj3_config_generator/convert.py | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/joj3_config_generator/convert.py b/joj3_config_generator/convert.py
index ca222b0..ced4596 100644
--- a/joj3_config_generator/convert.py
+++ b/joj3_config_generator/convert.py
@@ -1,25 +1,4 @@
-from joj3_config_generator.lib.repo import getHealthcheckConfig, getTeapotConfig
-from joj3_config_generator.lib.task import (
-    fix_comment,
-    fix_diff,
-    fix_keyword,
-    fix_result_detail,
-    get_conf_stage,
-    get_executorWithConfig,
-)
-from joj3_config_generator.models import (
-    Cmd,
-    CmdFile,
-    ExecutorConfig,
-    ExecutorWithConfig,
-    ParserConfig,
-    Repo,
-    ResultConfig,
-    Stage,
-    StageConfig,
-    Task,
-    TeapotConfig,
-)
+from joj3_config_generator.models import joj1, repo, result, task
 
 
 def convert(repo_conf: Repo, task_conf: Task) -> ResultConfig: