From e7bc6b36ee9fa439f7340d2cc0c7de9d3bc334c5 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Sat, 16 Apr 2011 19:17:37 +0200 Subject: Revert "Fix header image" This reverts commit b21d334cd8baf9c03edc37248160388cd5a39621. This commit is bullshit. --- public/css/sublab.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'public/css') diff --git a/public/css/sublab.css b/public/css/sublab.css index 5983a46..05ed3e3 100644 --- a/public/css/sublab.css +++ b/public/css/sublab.css @@ -53,7 +53,10 @@ div.image { margin-left: 125px; border: 1px solid #444; height: 150px; +<<<<<<< HEAD background: #000 url(../img/topimage.png) no-repeat left center; +======= +>>>>>>> cf403925786976a937b5fd33b7eacf7598009c47 } div.menu { -- cgit v1.2.1