docs: Remove merge artifact
authorJános Illés <ijanos@gmail.com>
Sun, 16 Oct 2016 19:45:28 +0000 (21:45 +0200)
committerdigitalcraftsman <digitalcraftsman@users.noreply.github.com>
Mon, 17 Oct 2016 13:44:05 +0000 (15:44 +0200)
commit7f4d90250fa89a75b50074d10191dccc24def41f
tree12d158d611738a168e4bbfd9c8cfd6ee322921b3
parentdf943595a73f009a73dc5c254dfde4a7b8a3787f
docs: Remove merge artifact
docs/content/taxonomies/displaying.md