aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorfeynmansfedora <hdawg7797@yahoo.com>2019-08-05 23:33:17 -0400
committerGitHub <noreply@github.com>2019-08-05 23:33:17 -0400
commit3edb7825b7ade6acbc12901e301c1a6cf2521405 (patch)
tree74621ac91790039769ddbf98e9b9e830520e6e1f /.gitignore
parent4f9439f9c416a81347e0b70fc94ee324e101bff2 (diff)
Update .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
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