Resolved conflict in conf.py

ps. also changed navigation (swapped community and getting started) Upstream-commit: 6c87db97a629f3d7b7f6e276a515506bcca8dbb1 Component: engine
2013-08-13 16:28:24 -07:00
parent 14d9fa64a4
commit 45e3eef148
1 changed files with 0 additions and 1 deletions
@@ -51,7 +51,6 @@ source_suffix = '.rst'
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'

-#disable the parmalinks on headers, I find them really annoying
 html_add_permalinks = u'¶'

 # The master toctree document.