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

---
 XiaoZhi/文档.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/XiaoZhi/文档.txt b/XiaoZhi/文档.txt
index f7feeda0..10f3a81f 100644
--- a/XiaoZhi/文档.txt
+++ b/XiaoZhi/文档.txt
@@ -44,4 +44,3 @@ pip install -r requirements.txt
 # 三、配置项目
 如果你的xiaozhi-server目录没有data，你需要创建data目录。如果你的data下面没有.config.yaml文件，你可以把源码目录下的config.yaml文件复制一份，重命名为.config.yaml
 
->>>>>>> bdebb3b90366de6dfe0841f14ff25e80f1a72125