From 877e49e3e317abcd0612ee28e2b7d0c7b9383527 Mon Sep 17 00:00:00 2001
From: xugaoyi <894072666@qq.com>
Date: Sat, 17 Jun 2023 18:33:54 +0800
Subject: [PATCH] =?UTF-8?q?blog:=20=E6=B7=BB=E5=8A=A0=E5=8F=8B=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/docs/04.更多/99.友情链接.md b/docs/04.更多/99.友情链接.md
index d8767c8..18dbe51 100644
--- a/docs/04.更多/99.友情链接.md
+++ b/docs/04.更多/99.友情链接.md
@@ -177,10 +177,17 @@ 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: 添加友链)
 ```
 :::