summaryrefslogtreecommitdiff
path: root/src/include/taler_exchange_service.h
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-05-03 19:54:36 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-05 16:46:41 +0200
commitef97d426b1bc8cf4869a914b9e6405924c62e7a4 (patch)
treeaf9217a77fbce2182d630ba6b0e90dbed6e86547 /src/include/taler_exchange_service.h
parent91e0debfbea8801b1f896bd6a08b27e19dc3bdf2 (diff)
downloadexchange-ef97d426b1bc8cf4869a914b9e6405924c62e7a4.tar.gz
exchange-ef97d426b1bc8cf4869a914b9e6405924c62e7a4.tar.bz2
exchange-ef97d426b1bc8cf4869a914b9e6405924c62e7a4.zip
update exchange API to return struct instead of lots of individual args for TALER_EXCHANGE_transfers_get() -- simplifies merchant later
Diffstat (limited to 'src/include/taler_exchange_service.h')
-rw-r--r--src/include/taler_exchange_service.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index 1fe7d2f8..2fb15db1 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
+>>>>>>> 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;