diff options
Diffstat (limited to 'template/topic')
| -rw-r--r-- | template/topic/topic | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/template/topic/topic b/template/topic/topic index 55a7766..18b4235 100644 --- a/template/topic/topic +++ b/template/topic/topic @@ -1,5 +1,4 @@ -<<<<<<< HEAD -08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b> +2. Februar: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b> @ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/> ======= Diese Woche im sublab:<br> @@ -11,6 +10,3 @@ Sa, ab 20oo Phantomspeisung<br> So, ab 19oo Westnetzgruendung -<!--08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b> -@ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>--> ->>>>>>> 002ccb53e6319619d503972c2a6bad0d4ead0c6f |