From 1000752d3d884735c541d0012c9fd99b6693e9fb Mon Sep 17 00:00:00 2001
From: fz <3474779149@qq.com>
Date: Sun, 12 Oct 2025 23:13:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3README.md=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E5=B9=B6=E6=B8=85=E7=90=86=E4=B8=B4=E6=97=B6=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/README.md b/doc/README.md
index 25f8d45..d81c081 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1 +1,5 @@
+<<<<<<< HEAD
 # Documentation
+=======
+这是doc目录的说明文档
+>>>>>>> c8630a7f95e8af73860302cdfe657069ddc7114c