mirror of
https://github.com/papercss/papercss
synced 2024-06-21 07:05:11 +02:00
Merge
This commit is contained in:
parent
25345929fc
commit
7dee3d0e83
|
@ -649,10 +649,7 @@ function add(x, y) {
|
||||||
<button popover-top="Popover on top">Popover on top and on a button!</button></pre>
|
<button popover-top="Popover on top">Popover on top and on a button!</button></pre>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
>>>>>>> refs/remotes/rhyneav/master
|
|
||||||
<div id="cards" class="section">
|
<div id="cards" class="section">
|
||||||
<h2>Cards</h2>
|
<h2>Cards</h2>
|
||||||
<h4>Full card example</h4>
|
<h4>Full card example</h4>
|
||||||
|
|
Loading…
Reference in a new issue