update and remove conflict content
This commit is contained in:
parent
e590fa1794
commit
1ab8396c75
1 changed files with 1 additions and 9 deletions
|
|
@ -47,15 +47,7 @@ func supportsWhisperTranscription(modelCfg *config.ModelConfig) bool {
|
|||
switch protocol {
|
||||
case "openai", "litellm", "openrouter", "groq", "zhipu", "gemini", "nvidia",
|
||||
"ollama", "moonshot", "shengsuanyun", "deepseek", "cerebras",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"vivgrid", "volcengine", "vllm", "qwen", "qwen-portal", "qwen-intl", "qwen-international", "dashscope-intl",
|
||||
=======
|
||||
"vivgrid", "volcengine", "vllm", "ovms", "qwen", "qwen-intl", "qwen-international", "dashscope-intl",
|
||||
>>>>>>> 793357c6 (Add ovms support)
|
||||
=======
|
||||
"vivgrid", "volcengine", "vllm", "ovms", "qwen", "qwen-intl", "qwen-international", "dashscope-intl",
|
||||
>>>>>>> 1cbec748785c37593377bc6b74bde7100dcce5a4
|
||||
"vivgrid", "volcengine", "vllm", "ovms", "qwen", "qwen-portal", "qwen-intl", "qwen-international", "dashscope-intl",
|
||||
"qwen-us", "dashscope-us", "mistral", "avian", "minimax", "longcat", "modelscope", "novita",
|
||||
"coding-plan", "alibaba-coding", "qwen-coding", "zai", "mimo":
|
||||
return true
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue