mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2026-08-31 17:40:52 +02:00
Merge branch 'upstream' into concedo_experimental
# Conflicts: # common/common.cpp # docs/backend/snapdragon/README.md # ggml/src/ggml-hexagon/htp/htp-ops.h # ggml/src/ggml-hexagon/htp/matmul-ops.c # ggml/src/ggml-opencl/CMakeLists.txt # ggml/src/ggml-opencl/ggml-opencl.cpp # scripts/pr2wt.sh # tests/test-backend-ops.cpp # tools/server/README.md
This commit is contained in:
+1
-1
@@ -510,7 +510,7 @@ json common_chat_msg_diff_to_json_oaicompat(const common_chat_msg_diff & diff) {
|
||||
}
|
||||
|
||||
#include "chat-parser.cpp"
|
||||
#include "common/unicode.cpp"
|
||||
#include "common/unicode.h"
|
||||
#include "peg-parser.cpp"
|
||||
#include "chat-peg-parser.cpp"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user