resolve merge conflict
[wakeup.git] / hardware / output.net
2019-12-26 Arjen BaartInitial revision