1 files changed, 3 insertions, 0 deletions

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