feat: merge conflict

This commit is contained in:
李衍志523370910113 2024-10-27 22:51:54 +08:00
parent 43083df88b
commit 57c7b46c6d

View File

@ -1,25 +1,4 @@
from joj3_config_generator.lib.repo import getHealthcheckConfig, getTeapotConfig from joj3_config_generator.models import joj1, repo, result, task
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,
)
def convert(repo_conf: Repo, task_conf: Task) -> ResultConfig: def convert(repo_conf: Repo, task_conf: Task) -> ResultConfig: