Resolve merge conflicts
This commit is contained in:
parent
0c17c075da
commit
d1cf680657
1 changed files with 1 additions and 5 deletions
|
|
@ -361,11 +361,7 @@ func normalizeModel(model, apiBase string) string {
|
|||
|
||||
prefix := strings.ToLower(before)
|
||||
switch prefix {
|
||||
<<<<<<< HEAD
|
||||
case "moonshot", "nvidia", "groq", "ollama", "deepseek", "google", "openrouter", "zhipu", "mistral", "vivgrid":
|
||||
=======
|
||||
case "litellm", "moonshot", "nvidia", "groq", "ollama", "deepseek", "google", "openrouter", "zhipu", "mistral":
|
||||
>>>>>>> origin_picoclaw/main
|
||||
case "litellm", "moonshot", "nvidia", "groq", "ollama", "deepseek", "google", "openrouter", "zhipu", "mistral", "vivgrid":
|
||||
return after
|
||||
default:
|
||||
return model
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue