aboutsummaryrefslogtreecommitdiff
path: root/src/include/taler_exchange_service.h
diff options
context:
space:
mode:
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 1fe7d2f8f..2fb15db11 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -1611,7 +1611,11 @@ struct TALER_EXCHANGE_TransferData
1611 struct GNUNET_TIME_Absolute execution_time; 1611 struct GNUNET_TIME_Absolute execution_time;
1612 1612
1613 /** 1613 /**
1614<<<<<<< HEAD
1614 * amount of the wire transfer; FIXME: total wired (without fee), or including @a wire_fee? 1615 * amount of the wire transfer; FIXME: total wired (without fee), or including @a wire_fee?
1616=======
1617 * amount of the wire transfer
1618>>>>>>> update exchange API to return struct instead of lots of individual args for TALER_EXCHANGE_transfers_get() -- simplifies merchant later
1615 */ 1619 */
1616 struct TALER_Amount total_amount; 1620 struct TALER_Amount total_amount;
1617 1621