biss/hexo-theme-butterfly
1
0
Fork 0
mirror of https://github.com/jerryc127/hexo-theme-butterfly.git synced 2026-06-06 05:11:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
myw
2024-11-05 18:03:47 +08:00
Unverified
parent f9aca1cb86 91c8c5cd4b
commit 997b76b967
25 changed files with 85 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+3
View File
@@ -1,6 +1,9 @@
{
"name": "hexo-theme-butterfly",
<<<<<<< HEAD
"version": "5.2.1",
=======
"version": "5.2.2",
"description": "A Simple and Card UI Design theme for Hexo",
"main": "package.json",
"scripts": {