From a3f46c9d2dd2617397c0d474ecc4401a5605bc63 Mon Sep 17 00:00:00 2001
From: Ryan Watters <watters.ryan@gmail.com>
Date: Sat, 25 Mar 2017 13:50:08 -0500
Subject: [PATCH] Resolve config conflict for taxonomies

---
 config.toml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/config.toml b/config.toml
index 973a8510f..c6fdb09d8 100644
--- a/config.toml
+++ b/config.toml
@@ -96,9 +96,5 @@ googleAnalytics = ""
   latexDashes = true
 
 [taxonomies]
-<<<<<<< HEAD
   tag = "tags"
-=======
-  tag = "tags"
-  category = ""
->>>>>>> bfb0257e17971af1cf5f2a21d325bc569acef75c
+  category = ""
\ No newline at end of file