aboutsummaryrefslogtreecommitdiffstats
path: root/test/functional/configs/merged.conf
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional/configs/merged.conf')
-rw-r--r--test/functional/configs/merged.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/functional/configs/merged.conf b/test/functional/configs/merged.conf
index 0718d0210..2b3640048 100644
--- a/test/functional/configs/merged.conf
+++ b/test/functional/configs/merged.conf
@@ -35,5 +35,6 @@ lua = "{= env.TESTDIR =}/lua/magic.lua"
# 380_external_relay
lua = "{= env.TESTDIR =}/lua/external_relay.lua"
+
.include(priority=1,duplicate=merge) "{= env.TESTDIR =}/configs/merged-local.conf"
.include(priority=2,duplicate=replace) "{= env.TESTDIR =}/configs/merged-override.conf"