exchange

commit ef97d426b1bc8cf4869a914b9e6405924c62e7a4
parent 91e0debfbea8801b1f896bd6a08b27e19dc3bdf2
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun,  3 May 2020 19:54:36 +0200

update exchange API to return struct instead of lots of individual args for TALER_EXCHANGE_transfers_get() -- simplifies merchant later

Diffstat:
M
src/include/taler_exchange_service.h
 | 
4
++++

1 file changed, 4 insertions(+), 0 deletions(-)
diff --git 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
+>>>>>>> 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;