Just testing merge

diff --git a/docs/conf.py.in b/docs/conf.py.in
index c27cd5c219bb20ba5512f6589fb812a8ca895b3b..a8adeaa0a593b19549a7737b79ee0fb3b5342af7 100644 (file)
--- 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.