Merge lines were not cleaned up after merge (#8227)

2025-07-23 17:27:19 +00:00 · 2019-01-21 20:38:27 +01:00 · 2019-01-21 20:38:27 +01:00 · f90c991a89
commit f90c991a89
parent a50f6e7511
1 changed files with 0 additions and 4 deletions
--- a/source/_components/binary_sensor.mqtt.markdown
+++ b/source/_components/binary_sensor.mqtt.markdown
@ -197,7 +197,3 @@ binary_sensor:
    payload_on: "1"
    payload_off: "0"
 ```
-<<<<<<< HEAD
-=======
-
->>>>>>> current