Update license related data and fix package version

ioBroker · May 19, 2024 · cbedee0 · cbedee0
2 parents ca32f81 + 9a61641
commit cbedee0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/io-package.json b/io-package.json
@@ -350,4 +350,4 @@
       "native": {}
     }
   ]
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,10 @@
 {
   "name": "iobroker.knx",
+<<<<<<< HEAD
   "version": "2.0.28",
+=======
+  "version": "2.0.27",
+>>>>>>> 9a61641178db2a70100a80322dd9d1f09974667a
   "description": "ioBroker knx Adapter ",
   "author": {
     "name": "K.Ringmann",
-Original file line number
+Diff line change
@@ Expand Up / @@ -350,4 +350,4 @@ @@
           "native": {}
         }
       ]
-    }
+    }