Resolve config conflict for taxonomies

This commit is contained in:
Ryan Watters
2017-03-25 13:50:08 -05:00
parent 8cfea6b1b5
commit a3f46c9d2d
+1 -5
View File
@@ -96,9 +96,5 @@ googleAnalytics = ""
latexDashes = true
[taxonomies]
<<<<<<< HEAD
tag = "tags"
=======
tag = "tags"
category = ""
>>>>>>> bfb0257e17971af1cf5f2a21d325bc569acef75c
category = ""