X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=docs%2Fconf.py.in;h=c27cd5c219bb20ba5512f6589fb812a8ca895b3b;hb=a65c93a2300eb0100c23ebb226fdbbd19a2aef5e;hp=a8adeaa0a593b19549a7737b79ee0fb3b5342af7;hpb=6953f8c1a076b300fe0658a4b82cb835110699d0;p=m6w6%2Flibmemcached

diff --git a/docs/conf.py.in b/docs/conf.py.in
index a8adeaa0..c27cd5c2 100644
--- a/docs/conf.py.in
+++ b/docs/conf.py.in
@@ -22,7 +22,6 @@ 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.