1 files changed, 0 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index dd2214a..affb9f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Testing/*
 .DS_Store
 .vagrant/*