Imported recent updated in Maneage, minor conflict fixed

The minor conflict was with 'reproduce/software/make/high-level.mk', and in
particular because we implemented the fix to Maneage's Task #15664 in this
project first. After it was moved to the main Maneage branch some minor
stylistic corrections were done to it, thus causing the conflict. To
resolve the conflict, I simply imported the full Maneage version of the
file with this command:

  git checkout maneage -- reproduce/software/make/high-level.mk

The other conflicts were due to the deleted files (that were resolved as
described in 'README-hacking.md') and the LaTeX files that I had told
'.gitattributes' to ignore from the Maneage branch.

1 files changed, 2 insertions, 2 deletions

diff --git a/reproduce/software/bibtex/missfits.tex b/reproduce/software/bibtex/missfits.tex
index 85a1645..bdb2879 100644
--- a/reproduce/software/bibtex/missfits.tex
+++ b/reproduce/software/bibtex/missfits.tex
@@ -8,11 +8,11 @@
 @ARTICLE{missfits,
        author = {{Marmo}, C. and {Bertin}, E.},
         title = "{MissFITS and WeightWatcher: Two Optimised Tools for Managing FITS Data.}",
-      journal = {Astronomical Data Analysis Software and Systems XVII},
+      journal = {ASPC},
          year = 2008,
        volume = {394},
        series = {Astronomical Society of the Pacific Conference Series},
         pages = {619},
        adsurl = {https://ui.adsabs.harvard.edu/abs/2008ASPC..394..619M},
       adsnote = {Provided by the SAO/NASA Astrophysics Data System}
-}
\ No newline at end of file
+}