解决合并冲突

5 months ago · c76b79074f
parent d1f0de43bb 43dffead0b
commit c76b79074f
1 changed files with 4 additions and 0 deletions
--- a/doc/report.md
+++ b/doc/report.md
@ -1 +1,5 @@
+<<<<<<< HEAD
 这是项目文档
+=======
+这是一个说明文件。
+>>>>>>> xh_branch