aboutsummaryrefslogtreecommitdiff
path: root/debian/etc/taler/conf.d/merchant.conf
diff options
context:
space:
mode:
Diffstat (limited to 'debian/etc/taler/conf.d/merchant.conf')
-rw-r--r--debian/etc/taler/conf.d/merchant.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/etc/taler/conf.d/merchant.conf b/debian/etc/taler/conf.d/merchant.conf
index b89751c3..41816b0b 100644
--- a/debian/etc/taler/conf.d/merchant.conf
+++ b/debian/etc/taler/conf.d/merchant.conf
@@ -4,3 +4,6 @@
[merchant]
DATABASE = postgres
+
+# Merchant-specific overrides, included last to take precedence.
+@inline-matching@ ../merchant-overrides.conf