From 79b71228c1659f4127f4c151859f8a8c22838147 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Wed, 18 Jan 2012 15:31:45 -0800
Subject: Fix some more merge conflicts.

---
 docs/_static/haiku.css  |   1 -
 docs/_static/header.png | Bin 98587 -> 16588 bytes
 2 files changed, 1 deletion(-)

(limited to 'docs/_static')

diff --git a/docs/_static/haiku.css b/docs/_static/haiku.css
index 41e0eb45..3d8ee6a7 100644
--- 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);
diff --git a/docs/_static/header.png b/docs/_static/header.png
index 19310618..2aaa53a1 100644
Binary files a/docs/_static/header.png and b/docs/_static/header.png differ
-- 
cgit v1.2.3