From cb77b835d4ab7f6e0c09fabdf391587b79e70a74 Mon Sep 17 00:00:00 2001
From: Fabiano Alencar <fabianocarvalho15@gmail.com>
Date: Mon, 13 Aug 2018 14:13:03 -0300
Subject: [PATCH] Fix conflict

---
 src/functions/single-functions.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/functions/single-functions.php b/src/functions/single-functions.php
index d23cdb0..2dc8345 100644
--- a/src/functions/single-functions.php
+++ b/src/functions/single-functions.php
@@ -85,7 +85,6 @@ function social_meta() {
 
     if(is_single() || is_tax() || is_archive()) {
 
-<<<<<<< HEAD
         $logo = get_stylesheet_directory_uri().'/assets/images/social-logo.png';
         global $wp;
         if(is_archive('tainacan-collection')){
@@ -105,11 +104,6 @@ function social_meta() {
                 $excerpt = get_bloginfo('description');
             }
         }
-=======
-        $logo = get_template_directory_uri().'/assets/images/logo.svg';
-
-        $img_info = (has_post_thumbnail($post->ID)) ? wp_get_attachment_image_src(get_post_thumbnail_id($post->ID), "thumbnail") : $logo;
->>>>>>> 3232a6522e85af07571c5b6c99d90963429321ca
         
         $image = array(
            'url' => (!empty($img_info[0]) && $img_info[1] >= 200 && $img_info[2] >= 200) ? $img_info[0] : $logo,