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

This commit is contained in:
aapjeisbaas 2019-01-21 20:38:27 +01:00 committed by Fabian Affolter
parent a50f6e7511
commit f90c991a89

View File

@ -197,7 +197,3 @@ binary_sensor:
payload_on: "1"
payload_off: "0"
```
<<<<<<< HEAD
=======
>>>>>>> current