fix

axolotl-ai-cloud · Dec 17, 2024 · 192fde5 · 192fde5
1 parent b186392
commit 192fde5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/axolotl/cli/main.py b/src/axolotl/cli/main.py
@@ -12,11 +12,7 @@
     build_command,
     fetch_from_github,
 )
-<<<<<<< HEAD
 from axolotl.common.cli import ConvertDiffTransformerCliArgs, EvaluateCliArgs, PreprocessCliArgs, TrainerCliArgs
-=======
-from axolotl.common.cli import EvaluateCliArgs, PreprocessCliArgs, TrainerCliArgs
->>>>>>> main
 from axolotl.utils.config.models.input.v0_4_1 import AxolotlInputConfig