From 0fe8332f565c3b611fad472e747b65d6e01824d0 Mon Sep 17 00:00:00 2001
From: kloschi klosch <klosch@netresearch.de>
Date: Thu, 2 Feb 2012 21:58:34 +0100
Subject: added streamlink

---
 template/topic/topic | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'template')

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
-- 
cgit v1.2.1