Update package.json

stoffel7 · Sep 28, 2023 · a402dd6 · a402dd6
1 parent 4d2a13c
commit a402dd6
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -14,13 +14,10 @@
  "@iobroker/adapter-core": "^2.6.8"
  },
  "devDependencies": {
-<<<<<<< HEAD
  "@alcalzone/release-script": "3.0.0",
  "@alcalzone/release-script-plugin-iobroker": "3.0.0",
  "@alcalzone/release-script-plugin-license": "3.0.0",
-=======
  "@alcalzone/release-script": "3.6.0",
->>>>>>> d05eabe20f6ca209a6a3555f6d867479e2545283
  "@iobroker/testing": "^4.1.0",
  "chai": "^4.1.2",
  "eslint": "^8.39.0",