diff options
Diffstat (limited to 'template/topic')
| -rw-r--r-- | template/topic/topic | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/template/topic/topic b/template/topic/topic index b3f5558..55a7766 100644 --- a/template/topic/topic +++ b/template/topic/topic @@ -1,3 +1,7 @@ +<<<<<<< HEAD +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/> +======= Diese Woche im sublab:<br> Mi, ab 19oo Elektronikrunde<br> @@ -9,3 +13,4 @@ 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 |