From 93def8057901ac149a18590b8c6aae16cc0484ef Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Sat, 12 Feb 2022 00:20:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index e49024f..c6bdae2 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,4 @@ 测试验证git相关功能 -<<<<<<< HEAD #### 这里新建了一个 dev 分支 -======= -#### 切换到 feature 分支修改内容 ->>>>>>> master