From febed4cae611e243da96346e7d567e817714976d Mon Sep 17 00:00:00 2001
From: Jon Maddox <jon@jonmaddox.com>
Date: Sat, 24 Oct 2015 11:34:41 -0400
Subject: [PATCH] derped the ignore

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3251bd8..1f72f1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,10 +15,6 @@ npm-debug.log
 config.json
 config.test.json
 persist/
-<<<<<<< HEAD
 log/
-=======
-
 
 .AppleDouble
->>>>>>> master