fix merge

This commit is contained in:
rhyneav 2017-11-23 10:49:28 -05:00
commit 995ce9232c

View file

@ -668,6 +668,7 @@ function add(x, y) {
&lt;button popover-top="Popover on top"&gt;Popover on top and on a button!&lt;/button&gt;</pre>
</div>
</div>
<div id="cards" class="section">
<h2>Cards</h2>
<h4>Full card example</h4>