diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-05-03 20:07:49 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-07-05 16:48:26 +0200 |
| commit | cdbf3a05ae3c92122b8ec15073c6fadfa0793315 (patch) | |
| tree | 293712acc7b7809b95ce29a8dcce958399093b32 /src/include | |
| parent | ef97d426b1bc8cf4869a914b9e6405924c62e7a4 (diff) | |
modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later)
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/taler_exchange_service.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 2fb15db11..ea185f09a 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -1611,11 +1611,7 @@ struct TALER_EXCHANGE_TransferData struct GNUNET_TIME_Absolute execution_time; /** -<<<<<<< HEAD - * amount of the wire transfer; FIXME: total wired (without fee), or including @a wire_fee? -======= * amount of the wire transfer ->>>>>>> update exchange API to return struct instead of lots of individual args for TALER_EXCHANGE_transfers_get() -- simplifies merchant later */ struct TALER_Amount total_amount; |