resolve: merge conflict - use main branch version for stable release

This commit is contained in:
rcourtman
2025-06-13 18:15:35 +01:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "pulse",
"version": "3.25.3",
"version": "3.25.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "pulse",
"version": "3.25.3",
"version": "3.25.4",
"license": "MIT",
"dependencies": {
"axios": "^1.9.0",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "pulse",
"version": "3.25.5-rc3",
"version": "3.25.4",
"description": "A lightweight monitoring application for Proxmox VE.",
"main": "server/index.js",
"scripts": {