From 7b460b43d15f6023a9171906c94054798e88bc67 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Mon, 14 Apr 2025 14:39:32 +0800
Subject: [PATCH] 'commit'

---
 XiaoZhi/文档.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/XiaoZhi/文档.txt b/XiaoZhi/文档.txt
index 8b92f1c8..f7feeda0 100644
--- a/XiaoZhi/文档.txt
+++ b/XiaoZhi/文档.txt
@@ -7,13 +7,12 @@ https://github.com/xinnan-tech/xiaozhi-esp32-server
 # Git下载
 git clone https://github.com/xinnan-tech/xiaozhi-esp32-server.git
 
-<<<<<<< HEAD
 # 小智 AI 聊天机器人百科全书
 https://ccnphfhqs21z.feishu.cn/wiki/F5krwD16viZoF0kKkvDcrZNYnhb
 
 # 购买店铺链接
 https://docs.qq.com/sheet/DWmRhbnVHSnRWc2xz?tab=vajqu5
-=======
+
 
 #添加清华源通道【如果需要要的话】
 conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/main