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/include/taler_util.h | |
| parent | 707449aa8f1a84d453a302b245dd4e076d93171a (diff) | |
| parent | fc8bdb9b978334d52b80c318f9326394f855de2d (diff) | |
fix merge conflict
Diffstat (limited to 'src/include/taler_util.h')
| -rw-r--r-- | src/include/taler_util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/include/taler_util.h b/src/include/taler_util.h index 58b1906c..3f593572 100644 --- a/src/include/taler_util.h +++ b/src/include/taler_util.h @@ -237,13 +237,13 @@ TALER_url_absolute_mhd (struct MHD_Connection *connection, /** - * Obtain the payment method from a @a payto_url + * Obtain the payment method from a @a payto_uri * - * @param payto_url the URL to parse - * @return NULL on error (malformed @a payto_url) + * @param payto_uri the URL to parse + * @return NULL on error (malformed @a payto_uri) */ char * -TALER_payto_get_method (const char *payto_url); +TALER_payto_get_method (const char *payto_uri); /** |