From ea3639d8f85f7b1b50d27966ca6cb24f756d336e Mon Sep 17 00:00:00 2001 From: Yu Shi Jie Date: Mon, 2 Dec 2024 19:26:25 -0500 Subject: [PATCH] fix: forgot to resolve conflicts --- litgpt/prompts.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/litgpt/prompts.py b/litgpt/prompts.py index 1c7b010838..6a99004de2 100644 --- 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()