opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
zihan987 2026-03-04 23:50:58 -08:00
parent d1cf680657
commit 91f52c4586
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/config/config.go
View file

@ -820,7 +820,6 @@ func (c *Config) findMatches(modelName string) []ModelConfig {
// HasProvidersConfig checks if any provider in the old providers config has configuration. // HasProvidersConfig checks if any provider in the old providers config has configuration.
func (c *Config) HasProvidersConfig() bool { func (c *Config) HasProvidersConfig() bool {
<<<<<<< HEAD
v := c.Providers v := c.Providers
return v.Anthropic.APIKey != "" || v.Anthropic.APIBase != "" || return v.Anthropic.APIKey != "" || v.Anthropic.APIBase != "" ||
v.OpenAI.APIKey != "" || v.OpenAI.APIBase != "" || v.OpenAI.APIKey != "" || v.OpenAI.APIBase != "" ||
@ -841,9 +840,7 @@ func (c *Config) HasProvidersConfig() bool {
v.Antigravity.APIKey != "" || v.Antigravity.APIBase != "" || v.Antigravity.APIKey != "" || v.Antigravity.APIBase != "" ||
v.Qwen.APIKey != "" || v.Qwen.APIBase != "" || v.Qwen.APIKey != "" || v.Qwen.APIBase != "" ||
v.Mistral.APIKey != "" || v.Mistral.APIBase != "" v.Mistral.APIKey != "" || v.Mistral.APIBase != ""
=======
return !c.Providers.IsEmpty() return !c.Providers.IsEmpty()
>>>>>>> origin_picoclaw/main
} }
// ValidateModelList validates all ModelConfig entries in the model_list. // ValidateModelList validates all ModelConfig entries in the model_list.