diff options
Diffstat (limited to 'public')
| -rw-r--r-- | public/css/sublab.css | 3 | ||||
| -rw-r--r-- | public/img/topimage.jpg | bin | 158049 -> 71066 bytes |
2 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 { diff --git a/public/img/topimage.jpg b/public/img/topimage.jpg Binary files differindex 331f0ca..447b26d 100644 --- a/public/img/topimage.jpg +++ b/public/img/topimage.jpg |
