Fix unresolved conflict on gh-pages

This commit is contained in:
Shouko Yu 2016-06-07 03:49:07 +08:00
parent 6ebe4e7d6b
commit cbea4b79e1

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>