Merge remote-tracking branch 'upstream/r-dev' into sync/pr-1564-upstream-20260331
# Conflicts: # src/chat/brain_chat/PFC/conversation.py # src/chat/brain_chat/PFC/pfc_KnowledgeFetcher.py # src/chat/knowledge/lpmm_ops.py
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -278,6 +278,8 @@ logs
|
||||
.vscode
|
||||
|
||||
/config/*
|
||||
config/mcp_config.json
|
||||
!config/mcp_config.json.template
|
||||
config/old/bot_config_20250405_212257.toml
|
||||
temp/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user