aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorHolden Rohrer <hdawg7797@yahoo.com>2019-08-02 12:05:18 -0400
committerHolden Rohrer <hdawg7797@yahoo.com>2019-08-02 12:05:18 -0400
commitb0a60771b013569c62a59157b34b95a7c9a4c141 (patch)
treef96c276524711845032f2e4d93919b3c41fceafb /.gitignore
parent1cfdee94df250223e3cffaa0079498e528f296c3 (diff)
parent6253f5563c1688c8cd6cb09a6669796e983bc869 (diff)
combined .gitignores
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index bda7ee5..83a15b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
.sort.py.swp
*.log
*.pdf
+<<<<<<< HEAD
*.DS_STORE
*.swp
+sort.tex