From d9933d4e7c5f378c7f7473970a8fee33e778b376 Mon Sep 17 00:00:00 2001
From: ryankeegan <r.keegan@me.com>
Date: Sun, 8 Apr 2018 16:38:57 -0700
Subject: [PATCH] Fun with git

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

diff --git a/.gitignore b/.gitignore
index 7eaee5c..8b810dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,7 @@ node_modules/
 .idea/
 *.log.*
 uploads/
-<<<<<<< HEAD
 dist/
-=======
->>>>>>> ebbb570f89e87134730dca884691f902d5e49736
 package-lock.json
 *~
 .DS_Store
\ No newline at end of file