mirror of
https://github.com/tiennm99/hugoDocs.git
synced 2026-10-13 16:14:59 +00:00
Resolve config conflict for taxonomies
This commit is contained in:
1 parent
8cfea6b1b5
commit
a3f46c9d2d
1 file changed
+1
-5
+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