resolve merge conflict
[wakeup.git] / src / location.h
2020-09-07 Arjen BaartSunrise and sunset events