fix merge conflict

This commit is contained in:
Kyle Drake 2019-01-19 03:35:57 -08:00
parent 590d2bdd49
commit 9b8d7747b8

View file

@ -37,7 +37,7 @@
<a href="/dashboard" class="btn-Action edit"><i class="fa fa-edit" title="Edit"></i> Edit Site</a>
<% end %>
<% if site.latest_archive && !site.archiving_disabled && false %>
<% if site.latest_archive && site.ipfs_archiving_enabled %>
<a href="/site/<%= site.username %>/archives" class="btn-Action edit"><i class="fa fa-history" title="Archives"></i> Archives</a>
<% end %>