aboutsummaryrefslogtreecommitdiff
path: root/reproduce/analysis/make/top-make.mk
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2020-04-17 04:02:28 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2020-04-17 04:02:28 +0100
commit9ed594ec27405e38548d6efd6fe28a4dabf0fb41 (patch)
treec1fdf80bd1b65056d5216b9cdda2e3fccc958c1a /reproduce/analysis/make/top-make.mk
parentf4d998a36d6777164147b848b0ac4747c38067cf (diff)
parent8eb0892e179b4970a9835d29b5f57dd912ca4464 (diff)
Imported recent work in Maneage, minor conflicts fixed
A few minor conflicts came up that were easily fixed.
Diffstat (limited to 'reproduce/analysis/make/top-make.mk')
-rw-r--r--reproduce/analysis/make/top-make.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/reproduce/analysis/make/top-make.mk b/reproduce/analysis/make/top-make.mk
index 30d537a..5461f71 100644
--- a/reproduce/analysis/make/top-make.mk
+++ b/reproduce/analysis/make/top-make.mk
@@ -21,7 +21,7 @@
# Load the local configuration (created after running
# `./project configure').
-include reproduce/software/config/installation/LOCAL.conf
+include reproduce/software/config/LOCAL.conf