From 74a4bce138faddff29c643630472de8926a0b92b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 14 Oct 2021 08:05:33 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84=20?=
 =?UTF-8?q?=E3=80=90Github=20Actions=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f2deb6e..17e0f04 100644
--- a/README.md
+++ b/README.md
@@ -226,8 +226,8 @@
 
 - 敬请期待。。。
 
-<<<<<<< HEAD
-=======
+# <<<<<<< HEAD
+
 ---
 
 ### 🛬 一些分享
@@ -262,8 +262,8 @@
 [在腾讯连拿六个五星](https://mp.weixin.qq.com/s/tgSgZ-VeZwqyQYiMu2a4HQ)
 
 [学弟问了我一个问题](http://www.chengxuchu.com/#/Experience/%E5%BF%83%E8%B7%AF/%E5%AD%A6%E5%BC%9F%E9%97%AE%E4%BA%86%E6%88%91%E4%B8%80%E4%B8%AA%E9%97%AE%E9%A2%98)
->>>>>>> 22bdc0c59be8899da4fafa23916e21564fe07e53
 
+> > > > > > > 22bdc0c59be8899da4fafa23916e21564fe07e53
 
 ---