From eea1ee3b1592d9993cc81adfb92aa15e515ac45e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E7=81=BF?= <hc72304002@163.com>
Date: Wed, 28 May 2025 14:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/泛读报告/泛读报告.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/泛读报告/泛读报告.md b/doc/泛读报告/泛读报告.md
index 91b1bee..4cae427 100644
--- a/doc/泛读报告/泛读报告.md
+++ b/doc/泛读报告/泛读报告.md
@@ -1,4 +1,12 @@
+<<<<<<< HEAD
                            
 
 1 2
-85de61dbca5a0b894469df847a42be9e5905c00a
\ No newline at end of file
+85de61dbca5a0b894469df847a42be9e5905c00a
+=======
+
+test
+
+1 2
+85de61dbca5a0b894469df847a42be9e5905c00a
+>>>>>>> b8ef232 (提交说明)