ref: 7f4d90250fa89a75b50074d10191dccc24def41f
parent: df943595a73f009a73dc5c254dfde4a7b8a3787f
author: János Illés <[email protected]>
date: Sun Oct 16 17:45:28 EDT 2016
docs: Remove merge artifact
--- a/docs/content/taxonomies/displaying.md
+++ b/docs/content/taxonomies/displaying.md
@@ -110,7 +110,6 @@
<ul id="all-tags">
{{ range $name, $taxonomy := .Site.Taxonomies.tags }}-<<<<<<< HEAD
<li><a href="{{ "/tags/" | relLangURL }}{{ $name | urlize }}">{{ $name }}</a></li> {{ end }}</ul>