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, 14 insertions, 0 deletions

diff --git a/reproduce/software/config/servers-backup.conf b/reproduce/software/config/servers-backup.conf
new file mode 100644
index 0000000..c2ade5a
--- /dev/null
+++ b/reproduce/software/config/servers-backup.conf
@@ -0,0 +1,14 @@
+# Default servers to use as backup, later this should go in a file that is
+# not under version control (the actual server that the tarbal comes from
+# is irrelevant). Note that this is not a to be read as a variable but will
+# be parsed as a list.
+#
+# Copyright (C) 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 notice and
+# this notice are preserved.  This file is offered as-is, without any
+# warranty.
+http://gitlab.com/maneage/tarballs-software/-/raw/master
+http://git.maneage.org/tarballs-software.git/plain
+http://akhlaghi.org/maneage-software