docs: Remove merge artifact

This commit is contained in:
János Illés authored and digitalcraftsman committed 2016-10-17 15:44:05 +02:00
1 parent 7722b32aaf
commit cdc6d61ee9
1 file changed
-1
-1
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>