aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-05-11 10:03:34 +0200
committerChristian Grothoff <christian@grothoff.org>2020-05-11 10:03:34 +0200
commit178e549be349b74eeb3ed74e07b264acefad4e65 (patch)
tree0f1351b6469a953133e894315328628a644857c5
parentc1108af9629e8f698631f80b7eb222ac2b7d559b (diff)
parenteaa21af98e58dcfe2e8566a8a00ecae7a5482c40 (diff)
downloadexchange-178e549be349b74eeb3ed74e07b264acefad4e65.tar.gz
exchange-178e549be349b74eeb3ed74e07b264acefad4e65.zip
merge
-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 079987020..b86da9845 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>>>>>>> eaa21af98e58dcfe2e8566a8a00ecae7a5482c40
1615 */ 1619 */
1616 struct TALER_Amount total_amount; 1620 struct TALER_Amount total_amount;
1617 1621