Imported recent work in Maneage, minor conflicts fixed

A few minor conflicts came up that were easily fixed.

1 files changed, 16 insertions, 0 deletions

diff --git a/reproduce/analysis/config/gnuastro/astbuildprog.conf b/reproduce/analysis/config/gnuastro/astbuildprog.conf
new file mode 100644
index 0000000..7adb4d1
--- /dev/null
+++ b/reproduce/analysis/config/gnuastro/astbuildprog.conf
@@ -0,0 +1,16 @@
+# BuildProgram's configuration file depends on the build and is installed
+# along with the rest of Gnuastro. So we'll set any specific configuration
+# we want here, then import those.
+#
+# 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 notice and
+# this notice are preserved.  This file is offered as-is, without any
+# warranty.
+
+# To keep the program's compiled excutable file, comment this line.
+deletecompiled 1
+
+# Import the built configuration file
+config .local/etc/astbuildprog.conf
\ No newline at end of file