From 1da6032c9a2eb786ff4ed9bb5e6817c7d90933b4 Mon Sep 17 00:00:00 2001
From: Milan <mc@radiopiloten.de>
Date: Sat, 25 Feb 2023 23:17:25 +0100
Subject: [PATCH] fixup! Merge remote-tracking branch 'calcms/master'

---
 website/agenda/templates/coloradio/series_names.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/website/agenda/templates/coloradio/series_names.html b/website/agenda/templates/coloradio/series_names.html
index eeaedb6..7f8c2e4 100644
--- a/website/agenda/templates/coloradio/series_names.html
+++ b/website/agenda/templates/coloradio/series_names.html
@@ -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>