From 79b71228c1659f4127f4c151859f8a8c22838147 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Wed, 18 Jan 2012 15:31:45 -0800 Subject: Fix some more merge conflicts. --- docs/_static/header.png | Bin 98587 -> 16588 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/_static/header.png') 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