deblan-mirror/papercss
1
0
Fork 0
mirror of https://github.com/papercss/papercss synced 2024-06-15 20:25:10 +02:00
Code Issues Projects Releases Wiki Activity

Merge

Browse source
This commit is contained in:
Fraham 2017-11-23 20:10:51 +00:00
parent 25345929fc
commit 7dee3d0e83
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
index.html
View file

@ -649,10 +649,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>
<<<<<<< HEAD
=======
>>>>>>> refs/remotes/rhyneav/master
<div id="cards" class="section">
<h2>Cards</h2>
<h4>Full card example</h4>