Remove merge marker and address config error of ness_alarm#8125

fabaff merged 1 commit into

home-assistant:nexthome-assistant/home-assistant.io:nextfrom

nickw444:nwhyte/ness-alarm-fixnickw444/home-assistant.github.io:nwhyte/ness-alarm-fixCopy head branch name to clipboard