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