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

Removing missed conflict marker

Browse Source
This commit is contained in:
Iwan Kawrakow
2025-01-23 19:31:49 +02:00
parent b8eff06bb0
commit bb23d014ab
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/llama.cpp
View File

@@ -20042,6 +20042,7 @@ static int32_t llama_chat_apply_template_internal(
}
if (add_ass) {
ss << LU8("<｜Assistant｜>");
}
} else if (tmpl == LLM_CHAT_TEMPLATE_EXAONE_3) {
// ref: https://huggingface.co/LGAI-EXAONE/EXAONE-3.0-7.8B-Instruct/discussions/8#66bae61b1893d14ee8ed85bb
// EXAONE-3.0-7.8B-Instruct
@@ -20116,7 +20117,6 @@ static int32_t llama_chat_apply_template_internal(
if (add_ass) {
ss << "<|role_start|>assistant<|role_end|>";
>>>>>>> c9d1a3eb (Adopting chat template stuff from llama.cpp)
}
} else {
// template not supported