Resolve merge conflicts

This commit is contained in:
zihan987 2026-03-04 22:37:12 -08:00
parent 0c17c075da
commit d1cf680657

View file

@ -361,11 +361,7 @@ func normalizeModel(model, apiBase string) string {
prefix := strings.ToLower(before) prefix := strings.ToLower(before)
switch prefix { switch prefix {
<<<<<<< HEAD case "litellm", "moonshot", "nvidia", "groq", "ollama", "deepseek", "google", "openrouter", "zhipu", "mistral", "vivgrid":
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
return after return after
default: default:
return model return model