docs: Remove merge artifact

This commit is contained in:
János Illés 2016-10-16 21:45:28 +02:00 committed by digitalcraftsman
parent 7722b32aaf
commit cdc6d61ee9

View File

@ -110,7 +110,6 @@ The following example displays all tag keys:
<ul id="all-tags">
{{ range $name, $taxonomy := .Site.Taxonomies.tags }}
<<<<<<< HEAD
<li><a href="{{ "/tags/" | relLangURL }}{{ $name | urlize }}">{{ $name }}</a></li>
{{ end }}
</ul>