aboutsummaryrefslogtreecommitdiff
path: root/src/include/taler_exchange_service.h
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-01-19 17:04:35 +0100
committerChristian Grothoff <christian@grothoff.org>2020-01-19 17:06:12 +0100
commitb6543b8f9a0ef4de473568ba27e05ba50442ee97 (patch)
treeb29517e7aee281484ea960b92f53a6c13269904c /src/include/taler_exchange_service.h
parent707449aa8f1a84d453a302b245dd4e076d93171a (diff)
parentfc8bdb9b978334d52b80c318f9326394f855de2d (diff)
downloadexchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.tar.xz
fix merge conflict
Diffstat (limited to 'src/include/taler_exchange_service.h')
-rw-r--r--src/include/taler_exchange_service.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index 1c29e15c1..09eca8ed4 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -628,9 +628,9 @@ struct TALER_EXCHANGE_WireAggregateFees
struct TALER_EXCHANGE_WireAccount
{
/**
- * payto://-URL of the exchange.
+ * payto://-URI of the exchange.
*/
- const char *url;
+ const char *payto_uri;
/**
* Signature of the exchange over the account (was checked by the API).
@@ -639,7 +639,7 @@ struct TALER_EXCHANGE_WireAccount
/**
* Linked list of wire fees the exchange charges for
- * accounts of the wire method matching @e url.
+ * accounts of the wire method matching @e payto_uri.
*/
const struct TALER_EXCHANGE_WireAggregateFees *fees;