summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorChristian Franke <nobody@nowhere.ws>2011-04-16 19:15:04 +0200
committerChristian Franke <nobody@nowhere.ws>2011-04-16 19:17:57 +0200
commit2be27cc0e512eaddab7a8eaed97a6327dcbe561c (patch)
treea106a7f820817525b20de2529866f31b721de0ba /public
parente7bc6b36ee9fa439f7340d2cc0c7de9d3bc334c5 (diff)
Revert "Merge branch 'master' of oberon.sublab.org:website"
This reverts commit 9f12b48d2ca69adb6b95e4f003520efea10d444a, reversing changes made to cf403925786976a937b5fd33b7eacf7598009c47.
Diffstat (limited to 'public')
-rw-r--r--public/css/sublab.css5
-rw-r--r--public/img/topimage.pngbin410931 -> 0 bytes
2 files changed, 1 insertions, 4 deletions
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 {
diff --git a/public/img/topimage.png b/public/img/topimage.png
deleted file mode 100644
index b7707b7..0000000
--- a/public/img/topimage.png
+++ /dev/null
Binary files differ