fix bad merge

Olivier Chafik · Olivier Chafik · commit aa98e5903855 · 2025-02-03T14:01:49.000Z
diff --git a/common/common.cpp b/common/common.cpp
@@ -1879,7 +1879,6 @@ std::string common_chat_format_example(const common_chat_template & tmpl, bool u
 
 common_chat_templates common_chat_templates_from_model(const struct llama_model * model, const std::string & chat_template_override)
 {
-    auto vocab = llama_model_get_vocab(model);
     std::string default_template_src = chat_template_override == "chatml" ? CHATML_TEMPLATE_SRC : chat_template_override;
     std::string template_tool_use_src = chat_template_override == "chatml" ? CHATML_TEMPLATE_SRC : "";
     bool has_explicit_template = !chat_template_override.empty();

Original file line number	Diff line number	Diff line change
`@@ -1879,7 +1879,6 @@ std::string common_chat_format_example(const common_chat_template & tmpl, bool u`
`1879`	`1879`
`1880`	`1880`	`common_chat_templates common_chat_templates_from_model(const struct llama_model * model, const std::string & chat_template_override)`
`1881`	`1881`	`{`
`1882`		`- auto vocab = llama_model_get_vocab(model);`
`1883`	`1882`	`std::string default_template_src = chat_template_override == "chatml" ? CHATML_TEMPLATE_SRC : chat_template_override;`
`1884`	`1883`	`std::string template_tool_use_src = chat_template_override == "chatml" ? CHATML_TEMPLATE_SRC : "";`
`1885`	`1884`	`bool has_explicit_template = !chat_template_override.empty();`