Merge pull request #1024 from shouko/gh-pages

Fix unresolved conflict on gh-pages
This commit is contained in:
Kevin Ross 2016-06-06 14:58:44 -05:00
commit 22896b57fb

View File

@ -871,11 +871,7 @@
</div>
<div class="col-xs-2">
<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>
>>>>>>> master
</button>
</div>
</div>