From b21baa0c3eb30b0adbdf835652a26715d68afcf8 Mon Sep 17 00:00:00 2001 From: Saood Karim Date: Sat, 16 Aug 2025 00:20:13 -0500 Subject: [PATCH] fix merge conflict issue --- examples/server/server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/server/server.cpp b/examples/server/server.cpp index 82167117..71bd1f11 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -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();