error in package.json

ioBroker · May 19, 2024 · ceae05a · ceae05a
1 parent cbedee0
commit ceae05a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "iobroker.knx",
-<<<<<<< HEAD
   "version": "2.0.28",
-=======
-  "version": "2.0.27",
->>>>>>> 9a61641178db2a70100a80322dd9d1f09974667a
   "description": "ioBroker knx Adapter ",
   "author": {
     "name": "K.Ringmann",