resolve merge conflict
[wakeup.git] / .gitignore
2020-02-02 Arjen BaartMerge conflict in .gitignore
2020-02-02 Arjen BaartSimple web interface
2020-01-02 Arjen BaartAdapted to new hardware