Resolve merge conflict in config.example.json

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
+1 -5
View File
@@ -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
}
}
}