From 75a86ebe036373a6a1f5c7dfe29e474c519c9ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=8E=E9=9B=BB=E7=90=83?= <kagura_hoshina@foxmail.com>
Date: Fri, 27 Feb 2026 20:23:20 +0800
Subject: [PATCH] Resolve merge conflict in config.example.json

Removed conflicting lines and kept 'allow_from' as an empty array.
---
 config/config.example.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/config/config.example.json b/config/config.example.json
index f9c12f61b..55a823009 100644
--- a/config/config.example.json
+++ b/config/config.example.json
@@ -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
   }
-}
\ No newline at end of file
+}