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