diff options
| author | Christian Franke <nobody@nowhere.ws> | 2011-04-16 19:17:37 +0200 |
|---|---|---|
| committer | Christian Franke <nobody@nowhere.ws> | 2011-04-16 19:17:37 +0200 |
| commit | e7bc6b36ee9fa439f7340d2cc0c7de9d3bc334c5 (patch) | |
| tree | 81e80c9abdad38a53e642ea41ffab925cd3773c2 /public/css | |
| parent | 61ae821de79816cd409f93841c79476661b8d868 (diff) | |
Revert "Fix header image"
This reverts commit b21d334cd8baf9c03edc37248160388cd5a39621.
This commit is bullshit.
Diffstat (limited to 'public/css')
| -rw-r--r-- | public/css/sublab.css | 3 |
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 { |