jeans/home-assistant.io
jeans/home-assistant.io
1
0
Fork 0
mirror of https://github.com/home-assistant/home-assistant.io.git synced 2025-07-19 15:26:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts because I did not press save

Browse Source
This commit is contained in:
Paulus Schoutsen 2018-06-03 17:02:37 -04:00
parent bdaa81fcbf
commit 56b7172f6d
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/_components/binary_sensor.homematicip_cloud.markdown
View File

@ -9,11 +9,7 @@ sharing: true
footer: true footer: true
logo: homematic.png logo: homematic.png
ha_category: Binary Sensor ha_category: Binary Sensor
<<<<<<< HEAD
ha_release: 0.66
=======
ha_release: 0.70 ha_release: 0.70
>>>>>>> origin/current
ha_iot_class: "Local Push" ha_iot_class: "Local Push"
--- ---

4
source/_components/light.homematicip_cloud.markdown
View File

@ -9,11 +9,7 @@ sharing: true
footer: true footer: true
logo: homematic.png logo: homematic.png
ha_category: Switch ha_category: Switch
<<<<<<< HEAD
ha_release: 0.66
=======
ha_release: 0.70 ha_release: 0.70
>>>>>>> origin/current
ha_iot_class: "Local Push" ha_iot_class: "Local Push"
--- ---

4
source/_components/switch.homematicip_cloud.markdown
View File

@ -9,11 +9,7 @@ sharing: true
footer: true footer: true
logo: homematic.png logo: homematic.png
ha_category: Switch ha_category: Switch
<<<<<<< HEAD
ha_release: 0.66
=======
ha_release: 0.70 ha_release: 0.70
>>>>>>> origin/current
ha_iot_class: "Local Push" ha_iot_class: "Local Push"
--- ---