resolve merge conflict
[wakeup.git] / Makefile.am
2019-12-26 Arjen BaartInitial revision