diff options
| author | Florian Dold <florian@dold.me> | 2021-08-26 16:28:02 +0200 |
|---|---|---|
| committer | Florian Dold <florian@dold.me> | 2021-08-26 16:28:02 +0200 |
| commit | 21ec352775a5ae5f5def24232222dd56acf42eae (patch) | |
| tree | 8ad342c9a7d8705bc21d6e3f99129d9f4ee01cb0 /debian/etc/taler/conf.d | |
| parent | 5a7e69c09a008d84272ca61062523325f8a9d483 (diff) | |
| download | merchant-21ec352775a5ae5f5def24232222dd56acf42eae.tar.gz merchant-21ec352775a5ae5f5def24232222dd56acf42eae.tar.bz2 merchant-21ec352775a5ae5f5def24232222dd56acf42eae.zip | |
give overrides precedence
Diffstat (limited to 'debian/etc/taler/conf.d')
| -rw-r--r-- | debian/etc/taler/conf.d/merchant.conf | 3 |
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 |