Briq/camelot-py
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Vinayak Mehta
2018-09-11 18:51:47 +05:30
parent 066c5c6aca f72e83a1b3
commit 240ffc34ba
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/api.rst
-1
View File
@@ -32,4 +32,3 @@ Lower-Lower-Level Classes
:inherited-members: :inherited-members:
.. autoclass:: camelot.core.Cell .. autoclass:: camelot.core.Cell
:inherited-members:
docs/conf.py
+7
View File
@@ -189,10 +189,17 @@ html_use_smartypants = True
# Custom sidebar templates, maps document names to template names. # Custom sidebar templates, maps document names to template names.
html_sidebars = { html_sidebars = {
<<<<<<< HEAD
'index': ['sidebarintro.html', 'relations.html', 'sourcelink.html', 'index': ['sidebarintro.html', 'relations.html', 'sourcelink.html',
'searchbox.html', 'hacks.html'], 'searchbox.html', 'hacks.html'],
'**': ['sidebarlogo.html', 'localtoc.html', 'relations.html', '**': ['sidebarlogo.html', 'localtoc.html', 'relations.html',
'sourcelink.html', 'searchbox.html', 'hacks.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 # Additional templates that should be rendered to pages, maps page names to