mirror of
https://github.com/sipeed/picoclaw.git
synced 2026-07-28 01:27:58 +00:00
Resolve merge conflict in config.example.json
Removed conflicting lines and kept 'allow_from' as an empty array.
This commit is contained in:
@@ -79,14 +79,10 @@
|
||||
"whatsapp": {
|
||||
"enabled": false,
|
||||
"bridge_url": "ws://localhost:3001",
|
||||
<<<<<<< main
|
||||
"use_native": false,
|
||||
"session_store_path": "",
|
||||
"allow_from": []
|
||||
=======
|
||||
"allow_from": [],
|
||||
"reasoning_channel_id": ""
|
||||
>>>>>>> refactor/channel-system
|
||||
},
|
||||
"feishu": {
|
||||
"enabled": false,
|
||||
@@ -269,4 +265,4 @@
|
||||
"host": "127.0.0.1",
|
||||
"port": 18790
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user