summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustav Sörnäs <gusso230@student.liu.se>2019-10-07 17:40:24 +0200
committerGustav Sörnäs <gusso230@student.liu.se>2019-10-07 17:40:24 +0200
commit796fefaf6ca1aa546db3cf85fbc9e1da1d47a40d (patch)
treed5f06028624420aea9ebd3dd66e2568b6c7716ce
parent56b76203114821e5f7ecdf3bfd1f0f0824e72199 (diff)
parent474c1642a9deb0c5e1eafc7cabb0bd044b7aaa0f (diff)
downloadtfyy51-796fefaf6ca1aa546db3cf85fbc9e1da1d47a40d.tar.gz
Merge branch 'master' into DesignSpec
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index df4ebf9..ec759c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -275,3 +275,5 @@ TSWLatexianTemp*
# Makeindex log files
*.lpz
+
+*.DS_STORE