Moe/ogame-vue-ts
1
0
Fork 0
mirror of https://github.com/setube/ogame-vue-ts.git synced 2026-05-12 07:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(package): 解决buildDate字段冲突

Browse Source 
合并package.json中的buildDate字段，移除合并冲突标记，保持字段一致性。
This commit is contained in:
谦君
2025-12-15 22:36:33 +08:00
parent 7d1f36046d
commit 053bd24855
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -9,11 +9,7 @@
}, },
"private": true, "private": true,
"version": "1.2.5", "version": "1.2.5",
<<<<<<< Updated upstream
"buildDate": "2025/12/15 21:21:23", "buildDate": "2025/12/15 21:21:23",
=======
"buildDate": "2025/12/15 21:59:38",
>>>>>>> Stashed changes
"main": "dist-electron/main.js", "main": "dist-electron/main.js",
"type": "module", "type": "module",
"scripts": { "scripts": {