From 8bcf1f19e592d8cee83da64e5158312aacb0514d Mon Sep 17 00:00:00 2001
From: Jeremy Teitelbaum <jeremy.teitelbaum@uconn.edu>
Date: Mon, 9 Jul 2018 13:45:34 -0400
Subject: [PATCH] reconciling gitignore

---
 .gitignore | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0b3a016..7886797 100644
--- a/.gitignore
+++ b/.gitignore
@@ -245,10 +245,8 @@ TSWLatexianTemp*
 # generated if using elsarticle.cls
 *.spl
 
-<<<<<<< HEAD
-#
-.ipynb_checkpoints/
-=======
 .ipynb_checkpoints/
 .vscode/
->>>>>>> develop
+
+# emacs
+*~