From c1fe26e9c3a1f6d26ff5b653150deacf56c45b7c Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Fri, 3 Feb 2012 02:06:37 +0100 Subject: 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. --- public/img/onewire/digitemp.jpg | Bin 198727 -> 98733 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'public/img/onewire/digitemp.jpg') diff --git a/public/img/onewire/digitemp.jpg b/public/img/onewire/digitemp.jpg index dc0597c..0c15085 100644 Binary files a/public/img/onewire/digitemp.jpg and b/public/img/onewire/digitemp.jpg differ -- cgit v1.2.1