blog fix: 修复代码冲突

2023-06-17 19:27:19 +08:00 · 2023-06-17 19:27:19 +08:00 · 0989c4f9f5
parent 877e49e3e3
commit 0989c4f9f5
1 changed files with 0 additions and 3 deletions
--- 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: 添加友链)
 ```
 :::