summaryrefslogtreecommitdiff
path: root/src/include/taler_exchange_service.h
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-05-03 20:07:49 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-05 16:48:26 +0200
commitcdbf3a05ae3c92122b8ec15073c6fadfa0793315 (patch)
tree293712acc7b7809b95ce29a8dcce958399093b32 /src/include/taler_exchange_service.h
parentef97d426b1bc8cf4869a914b9e6405924c62e7a4 (diff)
downloadexchange-cdbf3a05ae3c92122b8ec15073c6fadfa0793315.tar.gz
exchange-cdbf3a05ae3c92122b8ec15073c6fadfa0793315.tar.bz2
exchange-cdbf3a05ae3c92122b8ec15073c6fadfa0793315.zip
modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later)
Diffstat (limited to 'src/include/taler_exchange_service.h')
-rw-r--r--src/include/taler_exchange_service.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index 2fb15db1..ea185f09 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;