kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixup! Merge remote-tracking branch 'calcms/master'

Browse Source
This commit is contained in:
Milan
2023-02-25 23:17:25 +01:00
parent 7dc128752f
commit 1da6032c9a
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/agenda/templates/coloradio/series_names.html
View File

@@ -18,13 +18,8 @@ Access-Control-Allow-Origin: *
style="display:none;"
>
<<<<<<<< HEAD:website/agenda/templates/coloradio/series_names.html
<option value="">- Sendereihe ausw&auml;hlen -</option>
<TMPL_LOOP series_names><option value="<TMPL_VAR series_name escape=0>"<TMPL_VAR selected escape=0>><TMPL_VAR series_name> <!--(<TMPL_VAR sum>)--></option>
========
<option value="">- Sendereihe -</option>
<TMPL_LOOP series_names><option value="<TMPL_VAR series_name escape=none>"<TMPL_VAR selected escape=none>><TMPL_VAR series_name> (<TMPL_VAR sum>)</option>
>>>>>>>> calcms/master:website/agenda/templates/default/series_names.html
</TMPL_LOOP>
</select>