[taler-exchange] branch master updated: dce

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 7d90a745 dce
7d90a745 is described below

commit 7d90a7454c093e99e33d06d400ae365852be0117
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Nov 17 13:24:44 2023 +0100

    dce
---
 contrib/wallet-core                      | 2 +-
 src/auditor/generate-auditor-basedb.conf | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/contrib/wallet-core b/contrib/wallet-core
index 621dad2c..4cfef06e 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit 621dad2c2ec9a2adc52076cebf65891d6764c802
+Subproject commit 4cfef06e890f1e556027c9e294a9c7736ec1ecbf
diff --git a/src/auditor/generate-auditor-basedb.conf 
b/src/auditor/generate-auditor-basedb.conf
index f718886d..3b107ccf 100644
--- a/src/auditor/generate-auditor-basedb.conf
+++ b/src/auditor/generate-auditor-basedb.conf
@@ -29,11 +29,6 @@ USERNAME = exchange
 PASSWORD = x
 
 [merchant]
-WIREFORMAT = default
-DEFAULT_MAX_DEPOSIT_FEE = TESTKUDOS:0.1
-KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv
-DEFAULT_MAX_WIRE_FEE = TESTKUDOS:0.10
-WIRE_TRANSFER_DELAY = 1 minute
 FORCE_AUDIT = YES
 
 [merchantdb-postgres]

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.