aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorRaul Infante-Sainz <infantesainz@gmail.com>2019-03-22 16:42:30 +0000
committerRaul Infante-Sainz <infantesainz@gmail.com>2019-03-22 16:42:30 +0000
commit04f1c2d11c091dd9d32e4f803d81bd5aab42bd81 (patch)
treed171e38ee5af6698ef350a71451d00ae34795bfc /.gitignore
parent4ecd180c77850b85441d46ed56512f63f11d61eb (diff)
parent356d998b87d93cc86dc44642ae95fed7478bc788 (diff)
Imported recent work in the main pipeline, conflicts fixed
Conflicts in `gcc' build comments and in mentioning software used in paper fixed.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5879789..5521ca7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ build
Makefile
tex/tikz
.gnuastro
+.DS_Store
.texlive*
tex/pipeline
LOCAL_tmp.mk