Permalink
Browse files

Resolve merge conflict

  • Loading branch information...
swanson committed Sep 21, 2015
2 parents 54864e6 + 17b8069 commit a22bcd6fba5ae8450513a1106aefd2d9faaf85d5
Showing with 5 additions and 0 deletions.
  1. +3 −0 _data/theme.yml
  2. +2 −0 _includes/social.html
View
@@ -28,3 +28,6 @@ google_analytics_key: UA-xxxx-x
# Toggle "Postings are my own" disclaimer in footer
show_disclaimer: true
# Toggle link/icon to view atom feed (/atom.xml) in sidebar
show_atom_feed: true
View
@@ -66,7 +66,9 @@
</a>
{% endif %}
{% if site.data.theme.show_atom_feed %}
<a title="Atom feed" id="atom" href="/atom.xml">
<i class="fa fa-rss-square"></i>
</a>
{% endif %}
</div>

0 comments on commit a22bcd6

Please sign in to comment.