From 0989c4f9f50291068166c3ed979ba045aa2b6ef5 Mon Sep 17 00:00:00 2001
From: xugaoyi <894072666@qq.com>
Date: Sat, 17 Jun 2023 19:27:19 +0800
Subject: [PATCH] =?UTF-8?q?blog=20fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/04.更多/99.友情链接.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/04.更多/99.友情链接.md b/docs/04.更多/99.友情链接.md
index 18dbe51..6764686 100644
--- a/docs/04.更多/99.友情链接.md
+++ b/docs/04.更多/99.友情链接.md
@@ -177,17 +177,14 @@ cardList 后面可跟随一个数字表示每行最多显示多少个，选值
   desc: 如果世界多了精彩，每一位都是创造者，大家都是你的观众
   avatar: https://blog.gmcj0816.top/img/SeriousWission_TouXiangPic.jpg
   link: https://blog.gmcj0816.top/
-<<<<<<< HEAD
 - name: 从01开始
   desc: 那就从零开始
   avatar: https://image.peterjxl.com/blog/re0.jpg
   link: https://www.peterjxl.com/
-=======
 - name: Gahing's blog # 昵称
   desc: 生活之珍爱，余缀于技术之间。 # 介绍
   avatar: https://www.gahing.top/img/avatar.jpeg # 头像
   link: https://www.gahing.top/  # 链接
->>>>>>> 1c89f723 (blog: 添加友链)
 ```
 :::