From 594d99f752c5f35c20907323b92750165ffc1e47 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Wed, 3 Feb 2016 12:41:05 -0500
Subject: [PATCH 1/2] add google site verification meta tag

---
 README.md         | 3 ++-
 lib/template.html | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 75f5f65..7ae7472 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 A Jekyll plugin to add metadata tags for search engines and social networks to better index and display your site's content.
 
-[![Gem Version](https://badge.fury.io/rb/jekyll-seo-tag.svg)](https://badge.fury.io/rb/jekyll-seo-tag) [![Build Status](https://travis-ci.org/benbalter/jekyll-seo-tag.svg)](https://travis-ci.org/benbalter/jekyll-seo-tag) 
+[![Gem Version](https://badge.fury.io/rb/jekyll-seo-tag.svg)](https://badge.fury.io/rb/jekyll-seo-tag) [![Build Status](https://travis-ci.org/benbalter/jekyll-seo-tag.svg)](https://travis-ci.org/benbalter/jekyll-seo-tag)
 
 ## What it does
 
@@ -64,6 +64,7 @@ The SEO tag will respect any of the following if included in your site's `_confi
   * `type` - Either `person` or `organization` (defaults to `person`)
   * `name` - If the user or organization name differs from the site's name
   * `links` - An array of links to social media profiles.
+* `google_site_verification` for verifying ownership via Google webmaster tools
 
 The SEO tag will respect the following YAML front matter if included in a post, page, or document:
 
diff --git a/lib/template.html b/lib/template.html
index 871348b..41b6aef 100644
--- a/lib/template.html
+++ b/lib/template.html
@@ -110,6 +110,10 @@
   {% endif %}
 {% endif %}
 
+{% if site.google_site_verification %}
+  <meta name="google-site-verification" content="{{ site.google_site_verification }}" />
+{% endif %}
+
 {% if site.logo %}
   <script type="application/ld+json">
     {

From e4019ed6edfb45d38313ed94f01868a16ef2d7a3 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 9 Feb 2016 16:22:28 -0500
Subject: [PATCH 2/2] resolve merge conflict

---
 lib/template.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/template.html b/lib/template.html
index 6697942..53dca26 100644
--- a/lib/template.html
+++ b/lib/template.html
@@ -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 %}