From c8609e843387331dc5e348c742f4d2b3489e83de Mon Sep 17 00:00:00 2001
From: Jerry Wong <hwy0127@gmail.com>
Date: Tue, 5 Nov 2024 19:12:36 +0800
Subject: [PATCH] Update package.json

---
 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",