From 0bf748cc19f37587c6c6fd82f26d66beb0758eba Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 27 Mar 2018 22:47:55 +0200
Subject: pre-merge changes towards #4939 patch

---
 src/backend/merchant.conf | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/backend/merchant.conf')

diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
index 45a13cff..e3e0a681 100644
--- a/src/backend/merchant.conf
+++ b/src/backend/merchant.conf
@@ -58,4 +58,9 @@ CONFIG = postgres:///talermerchant
 KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv
 
 [merchant-instance-wireformat-default]
+# File where the merchant's address is provided.
 TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tutorial.json
+# Should this address be used in offers we create right now?
+# Inactive addresses (NO) will be supported for legacy contracts
+# but not used for new contracts.
+ACTIVE = YES
-- 
cgit v1.2.3