merchant

commit fb3f721df8b4f31b28e89375eca9586149a6c353
parent 0eeda08acc6083244c5aef35e88a1f490dd07566
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Mon,  7 Dec 2015 15:51:26 +0100

Adding taler "demo" mint master key into config file

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

1 file changed, 2 insertions(+), 4 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 x
+TRUSTED_MINTS = taler
 
 # How quickly do we want the mint to send us our money?
 # Used only if the frontend does not specify a value.
@@ -26,9 +26,7 @@ DB = postgres
 
 [mint-taler]
 URI = mint.demo.taler.net
-
-[mint-x]
-URI = mint.demo.taler.net
+MASTER_KEY = Q1WVGRGC1F4W7RYC6M23AEGFEXQEHQ730K3GG0B67VPHQSRR75H0
 
 # Auditors must be in sections "auditor-", the rest of the section
 # name could be anything.