From 7f4d90250fa89a75b50074d10191dccc24def41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20Ill=C3=A9s?= <ijanos@gmail.com>
Date: Sun, 16 Oct 2016 21:45:28 +0200
Subject: [PATCH] docs: Remove merge artifact

---
 docs/content/taxonomies/displaying.md | 1 -
 1 file changed, 1 deletion(-)

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