Resolve merge conflict in conf.py

2018-09-11 18:56:02 +05:30
parent 240ffc34ba
commit 8d4dff7c8a
1 changed files with 0 additions and 7 deletions
@@ -189,17 +189,10 @@ html_use_smartypants = True

 # Custom sidebar templates, maps document names to template names.
 html_sidebars = {
-<<<<<<< HEAD
    'index': ['sidebarintro.html', 'relations.html', 'sourcelink.html',
              'searchbox.html', 'hacks.html'],
    '**': ['sidebarlogo.html', 'localtoc.html', 'relations.html',
           'sourcelink.html', 'searchbox.html', 'hacks.html']
-=======
-    'index': ['sidebarlogo.html', 'relations.html', 'sourcelink.html',
-              'searchbox.html'],
-    '**': ['sidebarlogo.html', 'localtoc.html', 'relations.html',
-           'sourcelink.html', 'searchbox.html']
->>>>>>> f72e83a1b3e292a7156e7ad5a51b738760c3608c
 }

 # Additional templates that should be rendered to pages, maps page names to