summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--public/css/sublab.css3
1 files changed, 3 insertions, 0 deletions
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 {