fix conflict in _config.yml

This commit is contained in:
Felipe Morais
2018-06-12 01:42:29 -03:00
parent 69a0fccd50
commit 171ebab3d7
3 changed files with 13 additions and 0 deletions
+7
View File
@@ -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>
+5
View File
@@ -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>

After

Width:  |  Height:  |  Size: 794 B