mdbootstrap/mdb-ui-kit
1
1
Fork 0
mirror of https://github.com/mdbootstrap/mdb-ui-kit.git synced 2024-09-22 20:09:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1024 from shouko/gh-pages

Browse Source 
Fix unresolved conflict on gh-pages
This commit is contained in:
Kevin Ross 2016-06-06 14:58:44 -05:00
commit 22896b57fb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@ -871,11 +871,7 @@
</div> </div>
<div class="col-xs-2"> <div class="col-xs-2">
<button type="button" class="btn btn-fab btn-material-grey-200 opensource"> <button type="button" class="btn btn-fab btn-material-grey-200 opensource">
<<<<<<< HEAD
<i class="material-icons">open_in_new</i>
=======
<i class="material-icons">grade</i> <i class="material-icons">grade</i>
>>>>>>> master
</button> </button>
</div> </div>
</div> </div>