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/template/template.html | |
| 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/template/template.html')
| -rw-r--r-- | template/template/template.html | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/template/template/template.html b/template/template/template.html index a1fb7dd..165e578 100644 --- a/template/template/template.html +++ b/template/template/template.html @@ -120,13 +120,10 @@ <hr> <a href="/webcam" class="img"><img src="img/thumb.rack.webcam.jpg" alt="Webcam im Fenster" class="webcamthumb"></a> <hr> -<<<<<<< HEAD -======= <a href="/img/tempgraph.png" class="img"><img src="img/thumb.tempgraph.png" alt="Temperaturen im sublab" class="webcamthumb"></a> <hr> <object data="http://reeknersprook.de/sublog/graph-small?width=180" type="image/png" title="sublog/graph"></object> <hr> ->>>>>>> 002ccb53e6319619d503972c2a6bad0d4ead0c6f <p class="member"> <a href="inc/sublab_ev_mitgliedsantrag.pdf">Mitglied werden</a> </p> |