Skip to content

Commit 56b7172

Browse files
committed
Fix merge conflicts because I did not press save
1 parent bdaa81f commit 56b7172

File tree

3 files changed

+0
-12
lines changed

3 files changed

+0
-12
lines changed

source/_components/binary_sensor.homematicip_cloud.markdown

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ sharing: true
99
footer: true
1010
logo: homematic.png
1111
ha_category: Binary Sensor
12-
<<<<<<< HEAD
13-
ha_release: 0.66
14-
=======
1512
ha_release: 0.70
16-
>>>>>>> origin/current
1713
ha_iot_class: "Local Push"
1814
---
1915

source/_components/light.homematicip_cloud.markdown

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ sharing: true
99
footer: true
1010
logo: homematic.png
1111
ha_category: Switch
12-
<<<<<<< HEAD
13-
ha_release: 0.66
14-
=======
1512
ha_release: 0.70
16-
>>>>>>> origin/current
1713
ha_iot_class: "Local Push"
1814
---
1915

source/_components/switch.homematicip_cloud.markdown

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ sharing: true
99
footer: true
1010
logo: homematic.png
1111
ha_category: Switch
12-
<<<<<<< HEAD
13-
ha_release: 0.66
14-
=======
1512
ha_release: 0.70
16-
>>>>>>> origin/current
1713
ha_iot_class: "Local Push"
1814
---
1915

0 commit comments

Comments
 (0)