Merge conflict.

This commit is contained in:
Michael Teeuw
2019-06-14 13:19:29 +02:00
70 changed files with 2261 additions and 2633 deletions

View File

@@ -24,7 +24,7 @@
{% endif %}
<span class="wi dimmed wi-{{ current.nextSunAction() }}"></span>
<span>
{% if current.nextSunAction() == "sunset" %}
{% if current.nextSunAction() === "sunset" %}
{{ current.sunset | formatTime }}
{% else %}
{{ current.sunrise | formatTime }}