adamsdesk
/
jekyll-seo-tag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve merge conflict

This commit is contained in:
Ben Balter 2016-02-09 16:22:28 -05:00
parent 73827ad8ea
commit e4019ed6ed
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/template.html
View File

@ -113,14 +113,12 @@
{% endif %}
{% endif %}
<<<<<<< HEAD
{% if site.google_site_verification %}
<meta name="google-site-verification" content="{{ site.google_site_verification }}" />
=======
{% if site.facebook %}
<meta property="article:publisher" content="{{ site.facebook.publisher }}" />
<meta property="fb:app_id" content="{{ site.facebook.app_id }}" />
>>>>>>> master
{% if site.google_site_verification %}
<meta name="google-site-verification" content="{{ site.google_site_verification }}" />
{% endif %}
{% if site.logo %}