feat: merge conflict

2024-10-27 22:51:54 +08:00 · 2024-10-27 22:51:54 +08:00 · fa37c68a17
commit fa37c68a17
parent 26f5deb203
1 changed files with 1 additions and 13 deletions
--- a/joj3_config_generator/convert.py
+++ b/joj3_config_generator/convert.py
@ -1,16 +1,4 @@
-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


 # FIXME: LLM generated convert function, only for demostration