summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kiessling <mittagessen@l.unchti.me>2011-04-16 19:08:52 +0200
committerBenjamin Kiessling <mittagessen@l.unchti.me>2011-04-16 19:08:52 +0200
commitb21d334cd8baf9c03edc37248160388cd5a39621 (patch)
tree84eb9067d5822da49db7336e56f1ef663cf4ca29
parente6b8f17cd63c9e69f53bca3f913c097b1346fff1 (diff)
Fix header image
-rw-r--r--public/css/sublab.css3
1 files changed, 0 insertions, 3 deletions
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 {