Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJános Illés <ijanos@gmail.com>2016-10-16 22:45:28 +0300
committerdigitalcraftsman <digitalcraftsman@users.noreply.github.com>2016-10-17 16:44:05 +0300
commit7f4d90250fa89a75b50074d10191dccc24def41f (patch)
tree12d158d611738a168e4bbfd9c8cfd6ee322921b3 /docs
parentdf943595a73f009a73dc5c254dfde4a7b8a3787f (diff)
docs: Remove merge artifact
Diffstat (limited to 'docs')
-rw-r--r--docs/content/taxonomies/displaying.md1
1 files changed, 0 insertions, 1 deletions
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>