resolve merge conflict
[wakeup.git] / Makefile.am
1 SUBDIRS = src doc test