From: János Illés <ijanos@gmail.com>
Date: Sun, 16 Oct 2016 19:45:28 +0000 (+0200)
Subject: docs: Remove merge artifact
X-Git-Tag: v0.18~183
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7f4d90250fa89a75b50074d10191dccc24def41f;p=brevno-suite%2Fhugo

docs: Remove merge artifact
---

diff --git a/docs/content/taxonomies/displaying.md b/docs/content/taxonomies/displaying.md
index ba27d6ef..43dd48ba 100644
--- 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>