hugo

commit 7f4d90250fa89a75b50074d10191dccc24def41f
parent df943595a73f009a73dc5c254dfde4a7b8a3787f
Author: János Illés <ijanos@gmail.com>
Date:   Sun, 16 Oct 2016 21:45:28 +0200

docs: Remove merge artifact

Diffstat:
M
docs/content/taxonomies/displaying.md
 | 
1
-

1 file changed, 0 insertions(+), 1 deletion(-)
diff --git a/docs/content/taxonomies/displaying.md b/docs/content/taxonomies/displaying.md
@@ -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>