Fix broken test by 14f58e6619

2025-02-25 18:55:22 -06:00 · 2016-01-17 19:38:05 +09:00
parent 81fd24a565
commit f44fd9f994
1 changed files with 0 additions and 3 deletions
--- a/tests/roots/test-ext-graphviz/conf.py
+++ b/tests/roots/test-ext-graphviz/conf.py
@@ -2,12 +2,9 @@

 extensions = ['sphinx.ext.graphviz']
 master_doc = 'index'
-<<<<<<< 492f60c37185dccee1e42c01fb5d87ed42f45608
 exclude_patterns = ['_build']
-=======

 latex_documents = [
    (master_doc, 'SphinxTests.tex', 'Sphinx Tests Documentation',
     'Georg Brandl', 'manual'),
 ]
->>>>>>> ``sphinx.ext.graphviz``: show graph image in inline by default