fix: forgot to resolve conflicts

Lightning-AI · Dec 3, 2024 · ea3639d · ea3639d
1 parent a8b88cc
commit ea3639d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/litgpt/prompts.py b/litgpt/prompts.py
@@ -362,13 +362,10 @@ def model_name_to_prompt_style(model_name: str) -> PromptStyle:
         return OLMo()
     if re.search(r"Qwen2\.5-.*", model_name):
         return Qwen2_5()
-<<<<<<< HEAD
     if re.search(r"QwQ-.*", model_name):
         return QwQ()
-=======
     if re.search(r"SmolLM2.*", model_name):
         return SmolLM2()
->>>>>>> 961a30a (added smollm2)
     return Default()