Resolve merge commit

This commit is contained in:
Michael DeHaan 2013-06-09 13:57:20 -04:00
parent d706aca82b
commit 92dce671bb

View file

@ -13,7 +13,12 @@ get_header();
<div id="left-sidebar" class="span3 sidebar">
<div class="side-nav sidebar-block left-side-nav">
<ul><li><a href="/docs/"><strong>Documentation Home</strong></a></li></ul>
{{ toctree(maxdepth=1) }}
{{ toc }}
<hr />
<div class="qsButton pagination-centered" />
<a href="/quickstart"><button class="btn btn-primary" type="button">Quick Start Video</button></a>
</div>
</div>
</div>
{% endmacro %}