diff options
Diffstat (limited to 'src')
| -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 b86da9845..079987020 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 ->>>>>>> eaa21af98e58dcfe2e8566a8a00ecae7a5482c40 */ struct TALER_Amount total_amount; |