diff options
Diffstat (limited to 'public/css')
| -rw-r--r-- | public/css/sublab.css | 3 |
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 { |