From 9d1f50aebe2e04578cb46b15f98db26978490f91 Mon Sep 17 00:00:00 2001
From: Jeremy Teitelbaum <jeremy.teitelbaum@uconn.edu>
Date: Thu, 5 Jul 2018 13:49:48 -0400
Subject: [PATCH] fixed gitignore for emacs

---
 .gitignore | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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