🏷️ 更新2.3.0

README.md

@@ -1,10 +1,6 @@
 # hexo-theme-butterfly
 
-<<<<<<< HEAD
-<a href="https://github.com/jerryc127/hexo-theme-butterfly/releases"><img alt="Version" src="https://img.shields.io/badge/release-2.2.5-blue"/></a>
-=======
 <a href="https://github.com/jerryc127/hexo-theme-butterfly/releases"><img alt="Version" src="https://img.shields.io/badge/release-2.3.0-blue"/></a>
->>>>>>> dev
 <a href="https://jerryc.me"><img alt="Author" src="https://img.shields.io/badge/author-JerryC-blur"/></a>
 <a href="https://hexo.io"><img alt="Hexo" src="https://img.shields.io/badge/hexo-4.0+-0e83c"/></a>
 <a href="https://nodejs.org/"><img alt="node.js" src="https://img.shields.io/badge/node.js-8.0+-blur"/></a>

README_CN.md

@@ -1,10 +1,6 @@
 # hexo-theme-butterfly
 
-<<<<<<< HEAD
-<a href="https://github.com/jerryc127/hexo-theme-butterfly/releases"><img alt="Version" src="https://img.shields.io/badge/release-2.2.5-blue"/></a>
-=======
 <a href="https://github.com/jerryc127/hexo-theme-butterfly/releases"><img alt="Version" src="https://img.shields.io/badge/release-2.3.0-blue"/></a>
->>>>>>> dev
 <a href="https://jerryc.me"><img alt="Author" src="https://img.shields.io/badge/author-JerryC-blur"/></a>
 <a href="https://hexo.io"><img alt="Hexo" src="https://img.shields.io/badge/hexo-4.0+-0e83c"/></a>
 <a href="https://nodejs.org/"><img alt="node.js" src="https://img.shields.io/badge/node.js-8.0+-blur"/></a>

languages/zh-TW.yml

@@ -67,11 +67,7 @@ aside:
   card_webinfo:
     headline: 網站資訊
     article_name: 文章數目
-<<<<<<< HEAD
-    runtime_name: 已運行時間
-=======
     runtime_name: 已執行時間
->>>>>>> dev
     site_wordcount: 本站總字數
     site_uv_name: 本站訪客數
     site_pv_name: 本站總訪問量
@@ -84,13 +80,8 @@ bookmark:
 
 rightside:
   readmode_title: 閱讀模式
-<<<<<<< HEAD
-  font_plus_title: 放大字體
-  font_minus_title: 縮小字體
-=======
   font_plus_title: 放大字型
   font_minus_title: 縮小字型
->>>>>>> dev
   translate_title: 簡繁轉換
   night_mode_title: 夜間模式
   back_to_top: 回到頂部