From 830829dec0596760d0cba38d959ab2646112f61b Mon Sep 17 00:00:00 2001
From: Ben Beltran <ben@nsovocal.com>
Date: Mon, 3 Feb 2014 09:51:29 -0600
Subject: Proper merge for gitignore

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

diff --git a/.gitignore b/.gitignore
index 3d43fd7..cf9f70b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Object files
 *.o
 
@@ -168,4 +167,3 @@ $RECYCLE.BIN/
 
 # Mac crap
 .DS_Store
->>>>>>> bca44639c27169b0643de1b56361e6c2958d1d4a
-- 
cgit