resolve merge conflict
[wakeup.git] / test / wakeup-02.xml
2020-06-17 Arjen BaartCalculate event recurrance