From d11c63ab3f2e31be1cfde34ed83464a10a00751b Mon Sep 17 00:00:00 2001
From: adiao <1819192616@qq.com>
Date: Tue, 27 Sep 2022 18:00:04 +0800
Subject: [PATCH] Initial commit

---
 README.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 33e3a0e..8890dca 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-
 # bigwork
-
 the is new school working.
-=======
-
 # 工程简介
 
 课堂练习项目
@@ -14,4 +9,4 @@ the is new school working.
 # 延伸阅读
 
 涉及课外的编写思路，要项目要求、习惯。
-> > > > > > > a36cf6c (command init)
+