[taler-exchange] 29/152: merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

commit 178e549be349b74eeb3ed74e07b264acefad4e65
Merge: c1108af9 eaa21af9
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon May 11 10:03:34 2020 +0200

    merge

 src/include/taler_exchange_service.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc src/include/taler_exchange_service.h
index 07998702,38928dc1..b86da984
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@@ -1611,7 -1611,7 +1611,11 @@@ struct TALER_EXCHANGE_TransferDat
    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;
  

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.