From 053bd24855109043770fbecbe0bb80ef75376806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A6=E5=90=9B?=
 <73606411+setube@users.noreply.github.com>
Date: Mon, 15 Dec 2025 22:36:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(package):=20=E8=A7=A3=E5=86=B3buildDate?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

合并package.json中的buildDate字段，移除合并冲突标记，保持字段一致性。
---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 03b4898..e28483d 100644
--- a/package.json
+++ b/package.json
@@ -9,11 +9,7 @@
   },
   "private": true,
   "version": "1.2.5",
-<<<<<<< Updated upstream
   "buildDate": "2025/12/15 21:21:23",
-=======
-  "buildDate": "2025/12/15 21:59:38",
->>>>>>> Stashed changes
   "main": "dist-electron/main.js",
   "type": "module",
   "scripts": {