From cbea4b79e126f0a0e8581da6ed531b18f8b061cf Mon Sep 17 00:00:00 2001
From: Shouko Yu <imshouko@gmail.com>
Date: Tue, 7 Jun 2016 03:49:07 +0800
Subject: [PATCH] Fix unresolved conflict on gh-pages

---
 index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/index.html b/index.html
index b580bed9..21f72b01 100644
--- 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>