From 070eaffbb716098ebd02543cbaa9cf3bd1fb0bb9 Mon Sep 17 00:00:00 2001
From: DutchmanNL <rdrozda86@gmail.com>
Date: Sat, 23 Jan 2021 10:07:48 +0100
Subject: [PATCH] solve merge conflics of previous commit

---
 io-package.json | 27 ---------------------------
 package.json    |  5 -----
 2 files changed, 32 deletions(-)

diff --git a/io-package.json b/io-package.json
index b7e0a82..33acaa6 100644
--- a/io-package.json
+++ b/io-package.json
@@ -1,7 +1,6 @@
 {
     "common": {
         "name": "knx",
-<<<<<<< HEAD
         "version": "1.0.44",
         "news": {
             "1.0.44": {
@@ -16,10 +15,7 @@
                 "pl": "poprawiono obsługę działań i stanów, dodano kilka nowych typów punktów danych, naprawiono obiekt i rozpoznawanie pomieszczeń oraz przydział urządzeń",
                 "zh-cn": "修复了行为和状态处理，添加了一些新的数据点类型，修复了设施和房间识别以及设备分配"
             },
-=======
         "version": "1.0.42",
-        "news": {
->>>>>>> 13b9fe440755228304ffff502205cbac0df53f11
             "1.0.42": {
                 "en": "Fixed problem with missing index_m.html",
                 "de": "Problem mit fehlender index_m.html behoben",
@@ -143,7 +139,6 @@
         "restartAdapters": [
             "knx"
         ],
-<<<<<<< HEAD
         "adminColumns": [
             {
                 "name": {
@@ -167,28 +162,6 @@
                 "width": 100
             }
         ]
-=======
-        "adminColumns": [{
-            "name": {
-                "en": "KNX addr",
-                "de": "KNX-Adr",
-                "ru": "KNX-адр",
-                "pt": "End. KNX",
-                "nl": "KNX-adr",
-                "fr": "Adr KNX",
-                "it": "Ind KNX",
-                "es": "Dir KNX",
-                "pl": "Adr KNX",
-                "zh-cn": "KNX地址"
-            },
-            "path": "native.address",
-            "width": 100
-        }, {
-            "name": "DPT",
-            "path": "native.dpt",
-            "width": 100
-        }]
->>>>>>> 13b9fe440755228304ffff502205cbac0df53f11
     },
     "native": {
         "useBooleans": true,
diff --git a/package.json b/package.json
index 40af017..6d73a87 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,7 @@
 {
   "name": "iobroker.knx",
-<<<<<<< HEAD
   "version": "1.0.44",
   "description": "ioBroker knx Adapter",
-=======
-  "version": "1.0.42",
-  "description": "ioBroker knx Adapter ",
->>>>>>> 13b9fe440755228304ffff502205cbac0df53f11
   "author": {
     "name": "K.Ringmann",
     "email": "info@punktnetzwerk.net"