ikawrakow/ik_llama.cpp
1
0
Fork 0
mirror of https://github.com/ikawrakow/ik_llama.cpp.git synced 2026-02-25 15:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict issue

Browse Source
This commit is contained in:
Saood Karim
2025-08-16 00:20:13 -05:00
parent 63eb72e0e2
commit b21baa0c3e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/server/server.cpp
View File

@@ -3839,8 +3839,8 @@ int main(int argc, char ** argv) {
{ "system_prompt", ctx_server.system_prompt.c_str() },
{ "default_generation_settings", ctx_server.default_generation_settings_for_props },
{ "total_slots", ctx_server.params.n_parallel },
{ "n_ctx", ctx_server.n_ctx }
{ "chat_template", ctx_server.chat_templates.template_default->source() },
{ "n_ctx", ctx_server.n_ctx }
};
if (ctx_server.params.use_jinja && ctx_server.chat_templates.template_tool_use) {
data["chat_template_tool_use"] = ctx_server.chat_templates.template_tool_use->source();