merge develop

5minds · Oct 31, 2024 · dab148c · dab148c
1 parent a4df9f6
commit dab148c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-<<<<<<< HEAD
-    "version": "1.5.0",
-=======
     "version": "1.5.2",
->>>>>>> develop
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {