merge conflict

2020-10-12 19:25:54 +02:00 · 2020-10-12 19:25:54 +02:00 · 1d368f6870
commit 1d368f6870
parent a4138ff66c d495f1d66b
1 changed files with 1 additions and 1 deletions
--- a/code/views/station.etlua
+++ b/code/views/station.etlua
@ -3,7 +3,7 @@
        <div style="clear:both;height:5px;"></div>
        <div id="playingnowpic">

-            <% if item.img_url.len() > 0 %>
+            <% if item.img_url.len() > 0 then %>
                <% local img_url = item.img_url %>
            <% else %>
                <% local img_url = "blanco.png" %>