Allow scene configs to be merged#6815

Chris-V wants to merge 1 commit into

home-assistant:devhome-assistant/core:devfrom

Chris-V:merge_scene_configsChris-V/home-assistant:merge_scene_configsCopy head branch name to clipboard