From 6953f8c1a076b300fe0658a4b82cb835110699d0 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Thu, 21 Jul 2011 23:34:10 -0700 Subject: [PATCH] Just testing merge --- docs/conf.py.in | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/conf.py.in b/docs/conf.py.in index c27cd5c2..a8adeaa0 100644 --- a/docs/conf.py.in +++ b/docs/conf.py.in @@ -22,6 +22,7 @@ import sys, os # If your documentation needs a minimal Sphinx version, state it here. #needs_sphinx = '1.0' +# comment left to test merge # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -- 2.30.2