From 56b7172f6d9c57f21671da416d49993fa04a8de9 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 3 Jun 2018 17:02:37 -0400 Subject: [PATCH] Fix merge conflicts because I did not press save --- source/_components/binary_sensor.homematicip_cloud.markdown | 4 ---- source/_components/light.homematicip_cloud.markdown | 4 ---- source/_components/switch.homematicip_cloud.markdown | 4 ---- 3 files changed, 12 deletions(-) diff --git a/source/_components/binary_sensor.homematicip_cloud.markdown b/source/_components/binary_sensor.homematicip_cloud.markdown index 6c02815c750..e3c24a9c4a7 100644 --- 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" --- diff --git a/source/_components/light.homematicip_cloud.markdown b/source/_components/light.homematicip_cloud.markdown index de614c21c53..f3c76cf01c8 100644 --- 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" --- diff --git a/source/_components/switch.homematicip_cloud.markdown b/source/_components/switch.homematicip_cloud.markdown index 674d3484e03..b943caf6d0c 100644 --- 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" ---