diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-02 15:51:28 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-02 16:05:03 +0100 |
| commit | de3842a14e36b2debb3ad375d95411d15d45dc84 (patch) | |
| tree | 86ae571f85c639c616cf8939cbcec7f1c1be4c9c /.gitignore | |
| parent | 646756675566a0907edf143c6b6950e0479d9e7e (diff) | |
| parent | cbf177e09af6b9d240388d148b0cb5e3488d8b09 (diff) | |
Imported recent work on Maneage, minor conflicts fixed
A few minor conflicts occurred and were fixed.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -9,7 +9,7 @@ # To help readability, please add new files based on the length of the # line you wish to add. # -# Copyright (C) 2018-2019 Mohammad Akhlaghi <mohammad@akhlaghi.org> +# Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org> # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -33,16 +33,14 @@ mmap_* build .local .build -LOCAL.mk Makefile tex/tikz .gnuastro .DS_Store .texlive* +LOCAL.conf tex/pipeline LOCAL_tmp.mk LOCAL_old.mk gnuastro-local.conf - -reproduce/BDIR/ -reproduce/SURVEY/ +.compiler_test_dir_please_delete
\ No newline at end of file |