1 files changed, 2 insertions, 0 deletions

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