From 2be27cc0e512eaddab7a8eaed97a6327dcbe561c Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Sat, 16 Apr 2011 19:15:04 +0200 Subject: Revert "Merge branch 'master' of oberon.sublab.org:website" This reverts commit 9f12b48d2ca69adb6b95e4f003520efea10d444a, reversing changes made to cf403925786976a937b5fd33b7eacf7598009c47. --- public/css/sublab.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'public/css/sublab.css') diff --git a/public/css/sublab.css b/public/css/sublab.css index 05ed3e3..600e3bf 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 + background: #000 url(../img/topimage.jpg) no-repeat left bottom; } div.menu { -- cgit v1.2.1