Fix conflicts

This commit is contained in:
Oscar Cortez 2016-01-09 21:48:57 -06:00
commit 825098e4cd
2 changed files with 7 additions and 6 deletions

View file

@ -9,9 +9,10 @@ baseurl: "" # the subpath of your site, e.g. /blog/
url: "http://yourdomain.com" # the base hostname & protocol for your site
twitter_username: jekyllrb
github_username: jekyll
google_play: 'Jmz Software'
google_plus_com: '102719927712912982993' # Community link
google_plus_per: '+JamesTaylor3' #Personal link
google_play: 'GDGX'
google_plus_com: '109485346959707049693' # Community link
google_plus_per: '+GDGManagua' #Personal link
facebook_app_id: 12345
# Layout settings
header_type: default # values [ drawer, default ]