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

Resolve merge conflict in config.example.json

Browse source 
Removed conflicting lines and kept 'allow_from' as an empty array.
This commit is contained in:
美電球 2026-02-27 20:23:20 +08:00 • committed by GitHub
parent 6b427afa44
commit 75a86ebe03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/config.example.json
View file

@ -79,14 +79,10 @@
"whatsapp": { "whatsapp": {
"enabled": false, "enabled": false,
"bridge_url": "ws://localhost:3001", "bridge_url": "ws://localhost:3001",
<<<<<<< main
"use_native": false, "use_native": false,
"session_store_path": "", "session_store_path": "",
"allow_from": []
=======
"allow_from": [], "allow_from": [],
"reasoning_channel_id": "" "reasoning_channel_id": ""
>>>>>>> refactor/channel-system
}, },
"feishu": { "feishu": {
"enabled": false, "enabled": false,