From a69cb0543f0346642525e60607bcc1e50bbd5eee Mon Sep 17 00:00:00 2001
From: myw <hwy0127@gmail.com>
Date: Fri, 15 Nov 2024 14:52:52 +0800
Subject: [PATCH] update

---
 package.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package.json b/package.json
index 0b4dd0d..aa27123 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,5 @@
 {
   "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",