exchange

commit 178e549be349b74eeb3ed74e07b264acefad4e65
parent c1108af9629e8f698631f80b7eb222ac2b7d559b
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 11 May 2020 10:03:34 +0200

merge

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
+>>>>>>> eaa21af98e58dcfe2e8566a8a00ecae7a5482c40
    */
   struct TALER_Amount total_amount;