mirror of
https://github.com/gohugoio/hugo.git
synced 2026-08-24 23:38:53 +00:00
Resolve config conflict for taxonomies
This commit is contained in:
+1
-5
@@ -96,9 +96,5 @@ googleAnalytics = ""
|
||||
latexDashes = true
|
||||
|
||||
[taxonomies]
|
||||
<<<<<<< HEAD
|
||||
tag = "tags"
|
||||
=======
|
||||
tag = "tags"
|
||||
category = ""
|
||||
>>>>>>> bfb0257e17971af1cf5f2a21d325bc569acef75c
|
||||
category = ""
|
||||
Reference in New Issue
Block a user