diff options
| author | Christian Franke <nobody@nowhere.ws> | 2012-02-03 02:06:37 +0100 |
|---|---|---|
| committer | Christian Franke <nobody@nowhere.ws> | 2012-02-03 02:06:37 +0100 |
| commit | c1fe26e9c3a1f6d26ff5b653150deacf56c45b7c (patch) | |
| tree | 0eeefc08367387fb64689607cacd2ebf3ae9c1b0 /template/topic | |
| parent | 5826a58c7c3ca812f409663c30d46ff5b125957d (diff) | |
Revert "Merge branch 'master' of sublab.org:website"
This reverts commit 76f5eb72cda67da497ea4ba992778661559f26b4, reversing
changes made to 002ccb53e6319619d503972c2a6bad0d4ead0c6f.
Conflicts:
template/topic/topic
Guys, please learn how to use git. Have a look at
$ git diff origin/master master
and check if it looks reasonable. Also, if there is a merge in the
history, in our case, it is almost always bad. When you pull, use
$ git pull --rebase --ff-only
and not just a pull without arguments.
Diffstat (limited to 'template/topic')
| -rw-r--r-- | template/topic/topic | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/template/topic/topic b/template/topic/topic index 9a01254..dea8087 100644 --- a/template/topic/topic +++ b/template/topic/topic @@ -1,14 +1,2 @@ 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/> - -<br><br> - -Diese Woche im sublab:<br> - -Mi, ab 19oo Elektronikrunde<br> -Do, ab 20oo about:radio Stammtisch<br> -Do, ab 21oo Freifunktreff<br> -Sa, ab 20oo Phantomspeisung<br> -So, ab 19oo Westnetzgruendung - - +@ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>) |