Merge pull request #1024 from shouko/gh-pages

Fix unresolved conflict on gh-pages
2024-11-28 20:44:18 +03:00 · 2016-06-06 14:58:44 -05:00 · 2016-06-06 14:58:44 -05:00 · 22896b57fb
commit 22896b57fb
parent 6ebe4e7d6b cbea4b79e1
1 changed files with 0 additions and 4 deletions
--- a/index.html
+++ b/index.html
@ -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>