diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:04:35 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:06:12 +0100 |
commit | b6543b8f9a0ef4de473568ba27e05ba50442ee97 (patch) | |
tree | b29517e7aee281484ea960b92f53a6c13269904c /src/testing/test_exchange_api_keys_cherry_picking.conf | |
parent | 707449aa8f1a84d453a302b245dd4e076d93171a (diff) | |
parent | fc8bdb9b978334d52b80c318f9326394f855de2d (diff) | |
download | exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.tar.gz exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.tar.bz2 exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.zip |
fix merge conflict
Diffstat (limited to 'src/testing/test_exchange_api_keys_cherry_picking.conf')
-rw-r--r-- | src/testing/test_exchange_api_keys_cherry_picking.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf b/src/testing/test_exchange_api_keys_cherry_picking.conf index c5a69df3b..ea516168d 100644 --- a/src/testing/test_exchange_api_keys_cherry_picking.conf +++ b/src/testing/test_exchange_api_keys_cherry_picking.conf @@ -71,7 +71,7 @@ CONFIG = "postgres:///talercheck" WIRE_RESPONSE = ${TALER_CONFIG_HOME}/iban.json # What is the URL of our bank account? Must match WIRE_RESPONSE above! -URL = payto://x-taler-bank/localhost/42 +PAYTO_URI = payto://x-taler-bank/localhost/42 METHOD = "x-taler-bank" @@ -84,7 +84,7 @@ WIRE_GATEWAY_URL = "http://localhost:9082/42/" WIRE_RESPONSE = ${TALER_CONFIG_HOME}/x-taler-bank.json # What is the URL of our bank account? Must match WIRE_RESPONSE above! -URL = payto://x-taler-bank/localhost/2 +PAYTO_URI = payto://x-taler-bank/localhost/2 WIRE_GATEWAY_URL = "http://localhost:9082/2/" |