From f5535340114540ada46803c10bbf7f8d1fd6c7f4 Mon Sep 17 00:00:00 2001
From: shchmue <shchmue@gmail.com>
Date: Thu, 18 Apr 2019 13:15:03 -0400
Subject: [PATCH] Fix .gitignore

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

diff --git a/.gitignore b/.gitignore
index bed0972..5dfc71c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-build/
-output/
-=======
 .vscode
 build
 output
 research
->>>>>>> Add .gitignore