From 2e05e6fb47f96fec5cbb454d8b2db0f11639a8e3 Mon Sep 17 00:00:00 2001
From: Kris Hardy <kris@sub-sol.com>
Date: Wed, 30 Nov 2011 00:19:57 -0700
Subject: [PATCH] Consolidating ignores to /.gitignore

---
 .gitignore     | 1 +
 doc/.gitignore | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 doc/.gitignore

diff --git a/.gitignore b/.gitignore
index 66d537f..b8b1254 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /build
 /dist
 /push_to_pypi.sh
+/doc/_build
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index e35d885..0000000
--- a/doc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_build