Fix merge conflicts because I did not press save

2025-07-18 23:06:58 +00:00 · 2018-06-03 17:02:37 -04:00 · 2018-06-03 17:02:37 -04:00 · 56b7172f6d
commit 56b7172f6d
parent bdaa81fcbf
3 changed files with 0 additions and 12 deletions
--- a/source/_components/binary_sensor.homematicip_cloud.markdown
+++ b/source/_components/binary_sensor.homematicip_cloud.markdown
@ -9,11 +9,7 @@ sharing: true
 footer: true
 logo: homematic.png
 ha_category: Binary Sensor
-<<<<<<< HEAD
-ha_release: 0.66
-=======
 ha_release: 0.70
->>>>>>> origin/current
 ha_iot_class: "Local Push"
 ---

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

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