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/lib/exchange_api_handle.c | |
| 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/lib/exchange_api_handle.c')
| -rw-r--r-- | src/lib/exchange_api_handle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c index 94719f99a..a18ac9094 100644 --- a/src/lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c @@ -1534,7 +1534,7 @@ deserialize_data (struct TALER_EXCHANGE_Handle *exchange, &version), GNUNET_JSON_spec_json ("keys", &keys), - GNUNET_JSON_spec_string ("url", + GNUNET_JSON_spec_string ("exchange_url", &url), GNUNET_JSON_spec_absolute_time ("expire", &expire), @@ -1829,7 +1829,7 @@ TALER_EXCHANGE_serialize_data (json_int_t) TALER_SERIALIZATION_FORMAT_VERSION, "expire", GNUNET_JSON_from_time_abs (exchange->key_data_expiration), - "url", + "exchange_url", exchange->url, "keys", keys); |