🚑

gavinblog · Dec 3, 2023 · bbba57d · bbba57d
1 parent de0c436
commit bbba57d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 78 deletions.
diff --git a/src/assets/siteLinks.json b/src/assets/siteLinks.json
@@ -1,5 +1,4 @@
 [
-<<<<<<< HEAD
   [
     {
       "icon": "Blog",
@@ -40,41 +39,4 @@
       "link": "https://status.imsyy.top/"
     }
   ]
-=======
-  {
-    "icon": "Blog",
-    "name": "博客",
-    "link": "https://blog.imsyy.top/"
-  },
-  {
-    "icon": "Cloud",
-    "name": "网盘",
-    "link": "https://pan.imsyy.top/"
-  },
-  {
-    "icon": "CompactDisc",
-    "name": "音乐",
-    "link": "https://music.imsyy.top/"
-  },
-  {
-    "icon": "Compass",
-    "name": "起始页",
-    "link": "https://nav.imsyy.top/"
-  },
-  {
-    "icon": "Book",
-    "name": "网址集",
-    "link": "https://web.imsyy.top/"
-  },
-  {
-    "icon": "Fire",
-    "name": "今日热榜",
-    "link": "https://hot.imsyy.top/"
-  },
-  {
-    "icon": "LaptopCode",
-    "name": "站点监测",
-    "link": "https://status.imsyy.top/"
-  }
->>>>>>> 7854c9f459daaa1229f193f4d168bdf9f5faefca
 ]
diff --git a/src/assets/socialLinks.json b/src/assets/socialLinks.json
@@ -1,5 +1,4 @@
 [
-<<<<<<< HEAD
     {
         "name": "Github",
         "icon": "/images/icon/github.png",
@@ -37,42 +36,3 @@
         "url": "mailto:geekswg@qq.com"
     }
 ]
-=======
-  {
-    "name": "Github",
-    "icon": "/images/icon/github.png",
-    "tip": "去 Github 看看",
-    "url": "https://github.com/imsyy"
-  },
-  {
-    "name": "BiliBili",
-    "icon": "/images/icon/bilibili.png",
-    "tip": "(゜-゜)つロ 干杯 ~",
-    "url": "https://space.bilibili.com/98544142"
-  },
-  {
-    "name": "QQ",
-    "icon": "/images/icon/qq.png",
-    "tip": "有什么事吗",
-    "url": "https://res.abeim.cn/api/qq/?qq=1539250352"
-  },
-  {
-    "name": "Email",
-    "icon": "/images/icon/email.png",
-    "tip": "来封 Email ~",
-    "url": "mailto:one@imsyy.top"
-  },
-  {
-    "name": "Twitter",
-    "icon": "/images/icon/twitter.png",
-    "tip": "你懂的 ~",
-    "url": "https://twitter.com/iimmsyy"
-  },
-  {
-    "name": "Telegram",
-    "icon": "/images/icon/telegram.png",
-    "tip": "你懂的 ~",
-    "url": "https://t.me/bottom_user"
-  }
-]
->>>>>>> 7854c9f459daaa1229f193f4d168bdf9f5faefca