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_json_lib.h | |
parent | 707449aa8f1a84d453a302b245dd4e076d93171a (diff) | |
parent | fc8bdb9b978334d52b80c318f9326394f855de2d (diff) |
fix merge conflict
Diffstat (limited to 'src/include/taler_json_lib.h')
-rw-r--r-- | src/include/taler_json_lib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h index 9c6f3165..3d4896d3 100644 --- a/src/include/taler_json_lib.h +++ b/src/include/taler_json_lib.h @@ -170,11 +170,11 @@ TALER_JSON_exchange_wire_signature_check (const json_t *wire_s, /** * Create a signed wire statement for the given account. * - * @param payto_url account specification + * @param payto_uri account specification * @param master_priv private key to sign with, NULL to not sign */ json_t * -TALER_JSON_exchange_wire_signature_make (const char *payto_url, +TALER_JSON_exchange_wire_signature_make (const char *payto_uri, const struct TALER_MasterPrivateKeyP *master_priv); |