From 3edb7825b7ade6acbc12901e301c1a6cf2521405 Mon Sep 17 00:00:00 2001
From: feynmansfedora <hdawg7797@yahoo.com>
Date: Mon, 5 Aug 2019 23:33:17 -0400
Subject: Update .gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

(limited to '.gitignore')

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
-- 
cgit