1 files changed, 0 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 83a15b5..12bd243 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .sort.py.swp
 *.log
 *.pdf
-<<<<<<< HEAD
 *.DS_STORE
 *.swp
 sort.tex