index
:
school
master
Most of my work for the 2019-2020 school year
Holden Rohrer
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
space:
include
ignore
mode:
unified
ssdiff
stat only
Diffstat
-rw-r--r--
.gitignore
1
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