resolve merge conflict
[wakeup.git] / test / check_output
2020-03-31 Arjen BaartAdded configuration and logging for lightcontrol