merchant

commit bbe803e8bf5071174a294893b68eaf80ca994bf2
parent 18b7d37bfe54bb1abec3a82da840fcc0adc3d829
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue,  1 Dec 2015 15:58:03 +0100

Merge branch 'master' of ssh://taler.net/var/git/merchant

Diffstat:
M
src/backend/merchant.conf
 | 
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
@@ -14,7 +14,7 @@ KEYFILE = merchant.priv
 CURRENCY = KUDOS
 
 # FIXME: to be revised
-TRUSTED_MINTS = taler
+TRUSTED_MINTS = taler x
 
 # How quickly do we want the mint to send us our money?
 # Used only if the frontend does not specify a value.
@@ -22,7 +22,10 @@ TRUSTED_MINTS = taler
 EDATE = 3 week
 
 [mint-taler]
-HOSTNAME = mint.demo.taler.net
+URI = mint.demo.taler.net
+
+[mint-x]
+URI = mint.demo.taler.net
 
 # Auditors must be in sections "auditor-", the rest of the section
 # name could be anything.