mirror of
https://github.com/mdbootstrap/mdb-ui-kit.git
synced 2024-11-11 12:17:59 +03:00
Fix unresolved conflict on gh-pages
This commit is contained in:
parent
6ebe4e7d6b
commit
cbea4b79e1
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue
Block a user