From 171ebab3d7a3cd92690b3a0bb1835f25b8b2aa7c Mon Sep 17 00:00:00 2001
From: Felipe Morais <fmorais@thoughtworks.com>
Date: Tue, 12 Jun 2018 01:42:29 -0300
Subject: [PATCH] fix conflict in _config.yml

---
 _config.yml                      | 1 +
 _includes/icon-links.html        | 7 +++++++
 _includes/icons/icon-medium.html | 5 +++++
 3 files changed, 13 insertions(+)
 create mode 100644 _includes/icons/icon-medium.html

diff --git a/_config.yml b/_config.yml
index f66723c43d..f74cc24d6b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -44,6 +44,7 @@ resume_social_links:
   resume_linkedin_url:          "https://www.linkedin.com/in/joelglovier"
   # resume_instagram_url:         "insert your Instagram URL here"
   resume_website_url:           "http://joelglovier.com"
+  resume_medium_url:            "https://medium.com/@jglovier"
 resume_print_social_links:      true
 
 # Design settings
diff --git a/_includes/icon-links.html b/_includes/icon-links.html
index 2a151c7ab8..6c65af1c4a 100644
--- a/_includes/icon-links.html
+++ b/_includes/icon-links.html
@@ -7,6 +7,13 @@
   <li class="icon-link-item"><a href="{{ site.resume_social_links.resume_github_url }}" class="icon-link" itemprop="url">{% include icons/icon-github.html %}</a></li>
   {% endif %}
 
+<!-- Medium link -->
+{% if site.resume_social_links.resume_medium_url %}
+<li class="icon-link-item">
+  <a href="{{ site.resume_social_links.resume_medium_url }}" class="icon-link" itemprop="url">{% include icons/icon-medium.html %}</a>
+</li>
+{% endif %}
+
   <!-- Twitter link -->
   {% if site.resume_social_links.resume_twitter_url %}
   <li class="icon-link-item"><a href="{{ site.resume_social_links.resume_twitter_url }}" class="icon-link" itemprop="url">{% include icons/icon-twitter.html %}</a></li>
diff --git a/_includes/icons/icon-medium.html b/_includes/icons/icon-medium.html
new file mode 100644
index 0000000000..531442cb47
--- /dev/null
+++ b/_includes/icons/icon-medium.html
@@ -0,0 +1,5 @@
+<svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 28 28"
+    enable-background="new 0 0 28 28" xml:space="preserve" width="28">
+    <path id="Medium" fill="#D1CECC" d="M12 0c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm0 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm-2.426 14.741h-3.574v-.202l1.261-1.529c.134-.139.195-.335.162-.526v-5.304c.015-.147-.041-.293-.151-.392l-1.121-1.35v-.201h3.479l2.689 5.897 2.364-5.897h3.317v.201l-.958.919c-.083.063-.124.166-.106.269v6.748c-.018.103.023.206.106.269l.936.919v.201h-4.706v-.201l.969-.941c.095-.095.095-.123.095-.269v-5.455l-2.695 6.844h-.364l-3.137-6.844v4.587c-.026.193.038.387.174.526l1.26 1.529v.202z"
+    />
+</svg>