From b21d334cd8baf9c03edc37248160388cd5a39621 Mon Sep 17 00:00:00 2001 From: Benjamin Kiessling Date: Sat, 16 Apr 2011 19:08:52 +0200 Subject: Fix header image --- public/css/sublab.css | 3 --- 1 file changed, 3 deletions(-) (limited to 'public') diff --git a/public/css/sublab.css b/public/css/sublab.css index 05ed3e3..5983a46 100644 --- a/public/css/sublab.css +++ b/public/css/sublab.css @@ -53,10 +53,7 @@ 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