Resolve merge conflict in config.example.json
Removed conflicting lines and kept 'allow_from' as an empty array.
This commit is contained in:
parent
6b427afa44
commit
75a86ebe03
1 changed files with 1 additions and 5 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue