diary-website

commit a57df1284600cee54421644707b9f5f35f108df4
parent 7cb98143ae36f783a3c244157d463f3fac9cc6b3
Author: Heiswayi Nrird <hnrird@gmail.com>
Date:   Wed, 15 Jun 2016 00:35:07 +0800

Clear the mess...

Diffstat:
M
_config.yml
 | 
16
----------------
M
_includes/post-share.html
 | 
4
----

2 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/_config.yml b/_config.yml
@@ -1,29 +1,17 @@
 
 # SEO settings
 title: "Think"
-<<<<<<< HEAD
 title2: "space" # default: ""
 description: "Just another minimalist Jekyll theme that focuses on technical writing."
 keywords: "Jekyll, theme, free, download, SEO, blog, web, minimalist, thinkspace"
 url: http://heiswayi.github.io/thinkspace # site url
 baseurl: "/thinkspace" # apply repo name if use it under gh-pages branch
 # baseurl: null # apply null if repo name is something like username.github.io
-=======
-title2: "Space" # default: ""
-description: "Just another minimalist Jekyll theme that focuses on technical writing."
-keywords: "Jekyll, theme, free, download, SEO, blog, web, minimalist, thinkspace"
-url: http://heiswayi.github.io/thinkspace.html
-baseurl: "/thinkspace"
-# baseurl: null
->>>>>>> gh-pages
 
 google_analytics: UA-XXXXX-XX
 repo: http://github.com/heiswayi/thinkspace
 disqus_shortname: "heiswayi"
-<<<<<<< HEAD
 twitter_username: "HeiswayiNrird"
-=======
->>>>>>> gh-pages
 comments: true
 
 # Build settings
@@ -53,11 +41,7 @@ author:
   linkedin : http://linkedin.com/in/nrird
 
 # social settings
-<<<<<<< HEAD
 og_locale: "en_US"
-=======
-og_locale: "pt_BR"
->>>>>>> gh-pages
 twitter_card: "summary_large_image"
 twitter_site: "@HeiswayiNrird"
 
diff --git a/_includes/post-share.html b/_includes/post-share.html
@@ -1,11 +1,7 @@
 
 <aside class="share">
 
-<<<<<<< HEAD
   <p>If you liked this article and think others should read it, please <a href="http://twitter.com/share?text={{page.title}}&amp;url={{ site.url }}{{ page.url }}&amp;via={{ site.twitter_username }}"
-=======
-  <p>If you liked this article and think others should read it, please <a href="http://twitter.com/share?text={{page.title}}&amp;url={{ site.url }}{{ page.url }}"
->>>>>>> gh-pages
   onclick="window.open(this.href, 'twitter-share', 'width=550,height=235');return false;">share it on Twitter <i class="fa fa-twitter" aria-hidden="true" style="color:#00aced"></i></a> or <a href="https://www.facebook.com/sharer/sharer.php?u={{ site.url }}{{ page.url }}" onclick="window.open(this.href, 'facebook-share', 'width=550,height=235');return false;">Facebook <i class="fa fa-facebook-square" aria-hidden="true" style="color:#3b5998"></i></a>.</p>
 
 </aside>