diff options
| -rw-r--r-- | public/css/sublab.css | 5 | ||||
| -rw-r--r-- | public/img/topimage.png | bin | 410931 -> 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 Binary files differdeleted file mode 100644 index b7707b7..0000000 --- a/public/img/topimage.png +++ /dev/null |
