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_home/.config/taler/account-2.json | |
| 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_home/.config/taler/account-2.json')
| -rw-r--r-- | src/testing/test_exchange_api_home/.config/taler/account-2.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testing/test_exchange_api_home/.config/taler/account-2.json b/src/testing/test_exchange_api_home/.config/taler/account-2.json index f39677eff..21a7500b4 100644 --- a/src/testing/test_exchange_api_home/.config/taler/account-2.json +++ b/src/testing/test_exchange_api_home/.config/taler/account-2.json @@ -1,4 +1,4 @@ { - "url": "payto://x-taler-bank/localhost/2", + "payto_uri": "payto://x-taler-bank/localhost/2", "master_sig": "HEWC1XDS0QZ53YQR451VRKD4N968NXWGZXS30HJ59MJ0PESACK1ZYPYCAT15P08WD58C7D7F6EVN26D59JKA75XEBDQCM8VYFETK82R" }
\ No newline at end of file |