From 20d8013b26ac5754959149db83bd086e02a68ab3 Mon Sep 17 00:00:00 2001
From: Adam Fast <adam@adamfast.com>
Date: Fri, 28 Jun 2013 22:50:18 -0500
Subject: [PATCH] Fix gitignore from merge errors.

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

diff --git a/.gitignore b/.gitignore
index 66498dc..d37a789 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,3 @@
 .DS_Store
 .dropbox
-<<<<<<< HEAD
-<<<<<<< HEAD
 Icon
-=======
-Icon
->>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389
-=======
-Icon
->>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389