merge conflict

This commit is contained in:
2020-10-12 19:25:54 +02:00
+1 -1
View File
@@ -3,7 +3,7 @@
<div style="clear:both;height:5px;"></div> <div style="clear:both;height:5px;"></div>
<div id="playingnowpic"> <div id="playingnowpic">
<% if item.img_url.len() > 0 %> <% if item.img_url.len() > 0 then %>
<% local img_url = item.img_url %> <% local img_url = item.img_url %>
<% else %> <% else %>
<% local img_url = "blanco.png" %> <% local img_url = "blanco.png" %>