Fix some more merge conflicts.

2012-01-18 15:31:45 -08:00
parent 738ec92b8e
commit 79b71228c1
3 changed files with 83 additions and 13 deletions
--- a/docs/_static/haiku.css
+++ b/docs/_static/haiku.css
@@ -409,7 +409,6 @@ div.viewcode-block:target {
    padding: 0 12px;
 }

-
 #from_andyet {
    -webkit-box-shadow: #CCC 0px 0px 3px;
    background: rgba(255, 255, 255, 1);
--- a/docs/_static/header.png
+++ b/docs/_static/header.png