Update _config.yml

kinderyj · Dec 14, 2018 · 0a2ed16 · 0a2ed16
1 parent aca5682
commit 0a2ed16
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/_config.yml b/_config.yml
@@ -138,6 +138,3 @@ friends: [
         href: "http://xieminis.me/"
     }
 ]
-=======
-theme: jekyll-theme-leap-day
->>>>>>> 40387a449e7fa013ae4851e3e3b82f5c5379fa21