diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-05-11 10:03:34 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-05-11 10:03:34 +0200 |
| commit | 178e549be349b74eeb3ed74e07b264acefad4e65 (patch) | |
| tree | 0f1351b6469a953133e894315328628a644857c5 | |
| parent | c1108af9629e8f698631f80b7eb222ac2b7d559b (diff) | |
| parent | eaa21af98e58dcfe2e8566a8a00ecae7a5482c40 (diff) | |
| download | exchange-178e549be349b74eeb3ed74e07b264acefad4e65.tar.gz exchange-178e549be349b74eeb3ed74e07b264acefad4e65.tar.bz2 exchange-178e549be349b74eeb3ed74e07b264acefad4e65.zip | |
merge
| -rw-r--r-- | src/include/taler_exchange_service.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 079987020..b86da9845 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -1611,7 +1611,11 @@ 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 +>>>>>>> eaa21af98e58dcfe2e8566a8a00ecae7a5482c40 */ struct TALER_Amount total_amount; |