1. Bernhard Trinnes

Removing ws2812/ws2812.pro
Removing ws2812/translations/60b68c75-3261-4bf1-8912-798d2d3bbd3b-en_US.ts
Removing ws2812/translations/60b68c75-3261-4bf1-8912-798d2d3bbd3b-de_DE.ts
Removing ws2812/devicepluginws2812.json
Removing ws2812/devicepluginws2812.h
Removing ws2812/devicepluginws2812.cpp
Removing wemo/translations/2e3b5ce0-ecf1-43de-98f0-07df4068a583-de_DE.ts
Auto-merging wemo/integrationpluginwemo.json
Removing wemo/devicepluginwemo.h
Removing wemo/devicepluginwemo.cpp
Removing wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de_DE.ts
Auto-merging wakeonlan/integrationpluginwakeonlan.json
Removing wakeonlan/devicepluginwakeonlan.h
Removing wakeonlan/devicepluginwakeonlan.cpp
Removing unitec/unitec.pro
Removing unitec/translations/aefca391-f8bf-4f6c-a205-6764de3c2c3c-en_US.ts
Removing unitec/translations/aefca391-f8bf-4f6c-a205-6764de3c2c3c-de_DE.ts
Removing unitec/devicepluginunitec.json
Removing unitec/devicepluginunitec.h
Removing unitec/devicepluginunitec.cpp
Removing unipi/unipi.pro
Removing unipi/translations/26cba644-35ae-40a6-9c48-924198893a5f-en_US.ts
Removing unipi/dimmerswitch.h
Removing unipi/dimmerswitch.cpp
Removing unipi/devicepluginunipi.json
Removing unipi/devicepluginunipi.h
Removing unipi/devicepluginunipi.cpp
Removing udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-de_DE.ts
Auto-merging udpcommander/integrationpluginudpcommander.json
Removing udpcommander/devicepluginudpcommander.h
Removing udpcommander/devicepluginudpcommander.cpp
Auto-merging texasinstruments/integrationplugintexasinstruments.json
Removing texasinstruments/deviceplugintexasinstruments.h
Removing texasinstruments/deviceplugintexasinstruments.cpp
Removing tcpcommander/translations/741b7b0a-0c9c-4c93-be99-0d0bcf5a4643-de_DE.ts
Auto-merging tcpcommander/integrationplugintcpcommander.json
Removing tcpcommander/deviceplugintcpcommander.h
Removing tcpcommander/deviceplugintcpcommander.cpp
Auto-merging tasmota/integrationplugintasmota.json
Removing tasmota/deviceplugintasmota.h
Removing tasmota/deviceplugintasmota.cpp
Removing snapd/translations/b82bce59-59bf-48b3-b781-54a6f45800f3-de_DE.ts
Auto-merging snapd/integrationpluginsnapd.json
Removing snapd/devicepluginsnapd.h
Removing snapd/devicepluginsnapd.cpp
Auto-merging simulation/integrationpluginsimulation.json
Removing simulation/devicepluginsimulation.h
Removing simulation/devicepluginsimulation.cpp
Auto-merging serialportcommander/integrationpluginserialportcommander.json
Removing serialportcommander/devicepluginserialportcommander.h
Removing serialportcommander/devicepluginserialportcommander.cpp
Removing senic/translations/413e9d77-335f-4ecf-abbc-8f2a8a399c39-de_DE.ts
Auto-merging senic/integrationpluginsenic.json
Removing senic/devicepluginsenic.h
Removing senic/devicepluginsenic.cpp
Auto-merging remotessh/integrationpluginremotessh.json
Removing remotessh/devicepluginremotessh.h
Removing remotessh/devicepluginremotessh.cpp
Removing pushbullet/translations/46986575-0e62-483d-b5a8-76ac356fcce7-de_DE.ts
Auto-merging pushbullet/integrationpluginpushbullet.json
Removing pushbullet/devicepluginpushbullet.h
Removing pushbullet/devicepluginpushbullet.cpp
Removing plantcare/translations/80ea115f-2a9f-49b3-9575-9e36d137c8d6-en_US.ts
Removing plantcare/translations/80ea115f-2a9f-49b3-9575-9e36d137c8d6-de_DE.ts
Removing plantcare/plantcare.pro
Removing plantcare/devicepluginplantcare.json
Removing plantcare/devicepluginplantcare.h
Removing plantcare/devicepluginplantcare.cpp
Removing philipshue/translations/5f2e634b-b7f3-48ee-976a-b5ae22aa5c55-de_DE.ts
Removing philipshue/pairinginfo.h
Removing philipshue/pairinginfo.cpp
Auto-merging philipshue/integrationpluginphilipshue.json
Removing philipshue/hueoutdoorsensor.h
Removing philipshue/hueoutdoorsensor.cpp
Removing philipshue/devicepluginphilipshue.h
Removing philipshue/devicepluginphilipshue.cpp
Removing osdomotics/translations/78927596-e266-4a23-8634-7311b2c5fe32-de_DE.ts
Auto-merging osdomotics/integrationpluginosdomotics.json
Removing osdomotics/devicepluginosdomotics.h
Removing osdomotics/devicepluginosdomotics.cpp
Removing orderbutton/translations/939a6557-649d-43de-990b-3484f972ad86-en_US.ts
Removing orderbutton/translations/939a6557-649d-43de-990b-3484f972ad86-de_DE.ts
Removing orderbutton/orderbutton.pro
Removing orderbutton/devicepluginorderbutton.json
Removing orderbutton/devicepluginorderbutton.h
Removing orderbutton/devicepluginorderbutton.cpp
Removing openweathermap/translations/bc6af567-2338-41d5-aac1-462dec6e4783-de_DE.ts
Auto-merging openweathermap/integrationpluginopenweathermap.json
Removing openweathermap/devicepluginopenweathermap.h
Removing openweathermap/devicepluginopenweathermap.cpp
Removing networkdetector/translations/8e0f791e-b273-4267-8605-b7c2f55a68ab-de_DE.ts
Auto-merging networkdetector/integrationpluginnetworkdetector.json
Removing networkdetector/devicepluginnetworkdetector.h
Removing networkdetector/devicepluginnetworkdetector.cpp
Auto-merging netatmo/translations/69d14951-0c02-4877-bcef-dffdf48b7ccb-es.ts
CONFLICT (content): Merge conflict in netatmo/translations/69d14951-0c02-4877-bcef-dffdf48b7ccb-es.ts
Removing netatmo/translations/69d14951-0c02-4877-bcef-dffdf48b7ccb-de_DE.ts
Auto-merging netatmo/integrationpluginnetatmo.json
Removing netatmo/devicepluginnetatmo.h
Removing netatmo/devicepluginnetatmo.cpp
Auto-merging mqttclient/integrationpluginmqttclient.json
Removing mqttclient/devicepluginmqttclient.h
Removing mqttclient/devicepluginmqttclient.cpp
Removing mailnotification/translations/1ae35df1-1b51-4c93-94fa-3febc77e0318-de_DE.ts
Removing mailnotification/devicepluginmailnotification.json
Removing mailnotification/devicepluginmailnotification.h
Removing mailnotification/devicepluginmailnotification.cpp
Removing lircd/devicepluginlircd.cpp
Removing lgsmarttv/translations/4ef7a68b-9da0-4c62-b9ac-f478dc6f9f52-de_DE.ts
Auto-merging lgsmarttv/integrationpluginlgsmarttv.json
Removing lgsmarttv/devicepluginlgsmarttv.h
Removing lgsmarttv/devicepluginlgsmarttv.cpp
Removing leynew/translations/9a6d23e6-fad8-4203-aeab-2e6e5c756990-en_US.ts
Removing leynew/translations/9a6d23e6-fad8-4203-aeab-2e6e5c756990-de_DE.ts
Removing leynew/leynew.pro
Removing leynew/devicepluginleynew.json
Removing leynew/devicepluginleynew.h
Removing leynew/devicepluginleynew.cpp
Removing kodi/translations/e7186890-99fa-4c5b-8247-09c6d450d490-de_DE.ts
Auto-merging kodi/integrationpluginkodi.json
Removing kodi/devicepluginkodi.h
Removing kodi/devicepluginkodi.cpp
Removing keba/devicepluginkeba.json
Removing keba/devicepluginkeba.h
Removing keba/devicepluginkeba.cpp
Removing intertechno/translations/e998d934-0397-42c1-ad63-9141bcac8563-en_US.ts
Removing intertechno/translations/e998d934-0397-42c1-ad63-9141bcac8563-de_DE.ts
Removing intertechno/intertechno.pro
Removing intertechno/devicepluginintertechno.json
Removing intertechno/devicepluginintertechno.h
Removing intertechno/devicepluginintertechno.cpp
Removing httpcommander/devicepluginhttpcommander.json
Removing httpcommander/devicepluginhttpcommander.h
Removing httpcommander/devicepluginhttpcommander.cpp
Removing gpio/translations/127ead55-996a-44ac-ba82-fc3c634e018a-de_DE.ts
Auto-merging gpio/integrationplugingpio.json
Removing gpio/deviceplugingpio.h
Removing gpio/deviceplugingpio.cpp
Removing genericelements/translations/6e22161e-39b7-4416-8623-39e730721efb-de_DE.ts
Auto-merging genericelements/integrationplugingenericelements.json
Removing genericelements/deviceplugingenericelements.h
Removing genericelements/deviceplugingenericelements.cpp
Auto-merging flowercare/integrationpluginflowercare.json
Removing flowercare/devicepluginflowercare.h
Removing flowercare/devicepluginflowercare.cpp
Removing eq-3/translations/f324c43c-9680-48d8-852a-93b2227139b9-de_DE.ts
Auto-merging eq-3/integrationplugineq-3.json
Removing eq-3/deviceplugineq-3.h
Removing eq-3/deviceplugineq-3.cpp
Removing elro/translations/2b267f81-d9ae-4f4f-89a0-7386b547cfd3-en_US.ts
Removing elro/translations/2b267f81-d9ae-4f4f-89a0-7386b547cfd3-de_DE.ts
Removing elro/elro.pro
Removing elro/devicepluginelro.json
Removing elro/devicepluginelro.h
Removing elro/devicepluginelro.cpp
Removing elgato/translations/c5c03ad4-bfdb-444a-8eca-2c234c46cc27-de_DE.ts
Auto-merging elgato/integrationpluginelgato.json
Auto-merging elgato/integrationpluginelgato.cpp
Removing elgato/devicepluginelgato.h
Auto-merging dweetio/integrationplugindweetio.json
Removing dweetio/deviceplugindweetio.h
Removing dweetio/deviceplugindweetio.cpp
Removing denon/translations/cd758269-dbbb-4ef0-80ab-48bd9a8a2765-de_DE.ts
Removing denon/deviceplugindenon.json
Removing denon/deviceplugindenon.h
Removing denon/deviceplugindenon.cpp
Removing denon/denonconnection.h
Removing denon/denonconnection.cpp
Removing debian/nymea-plugin-ws2812.install.in
Removing debian/nymea-plugin-unitec.install.in
Removing debian/nymea-plugin-unipi.install.in
Removing debian/nymea-plugin-plantcare.install.in
Removing debian/nymea-plugin-orderbutton.install.in
Removing debian/nymea-plugin-leynew.install.in
Removing debian/nymea-plugin-intertechno.install.in
Removing debian/nymea-plugin-elro.install.in
Removing debian/nymea-plugin-conrad.install.in
Auto-merging daylightsensor/integrationplugindaylightsensor.json
Auto-merging daylightsensor/integrationplugindaylightsensor.cpp
Removing daylightsensor/deviceplugindaylightsensor.h
Removing datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-de_DE.ts
Auto-merging datetime/integrationplugindatetime.json
Auto-merging datetime/integrationplugindatetime.cpp
Removing datetime/deviceplugindatetime.h
Removing conrad/translations/1fd1a076-f229-4ec6-b501-48ddd15935e4-en_US.ts
Removing conrad/translations/1fd1a076-f229-4ec6-b501-48ddd15935e4-de_DE.ts
Removing conrad/devicepluginconrad.json
Removing conrad/devicepluginconrad.h
Removing conrad/devicepluginconrad.cpp
Removing conrad/conrad.pro
Removing commandlauncher/translations/5d37b796-4872-4eab-a7af-94ca9ddd8199-de_DE.ts
Auto-merging commandlauncher/integrationplugincommandlauncher.json
Removing commandlauncher/deviceplugincommandlauncher.h
Removing commandlauncher/deviceplugincommandlauncher.cpp
Auto-merging boblight/integrationpluginboblight.json
Removing boblight/devicepluginboblight.h
Removing boblight/devicepluginboblight.cpp
Removing awattar/translations/9c261c33-d44e-461e-8ec1-68803cb73f12-de_DE.ts
Removing awattar/heatpump.h
Removing awattar/heatpump.cpp
Removing awattar/devicepluginawattar.json
Removing awattar/devicepluginawattar.h
Removing awattar/devicepluginawattar.cpp
Removing avahimonitor/translations/d83fb167-cef7-4347-8c58-fa39df7bea4f-de_DE.ts
Auto-merging avahimonitor/integrationpluginavahimonitor.json
Removing avahimonitor/devicepluginavahimonitor.h
Removing avahimonitor/devicepluginavahimonitor.cpp
Auto-merging anel/integrationpluginanel.json
Removing anel/devicepluginanel.h
Removing anel/devicepluginanel.cpp
Removing LICENSE
Automatic merge failed; fix conflicts and then commit the result. (1)