[taler-exchange] 47/152: return fee as well

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

commit 5a4547388bae6713e8786e1c527e7eec5ee0abb3
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue May 5 22:17:16 2020 +0200

    return fee as well
---
 src/lib/exchange_api_refund.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c
index 6f91389f..62f49598 100644
--- a/src/lib/exchange_api_refund.c
+++ b/src/lib/exchange_api_refund.c
@@ -177,9 +177,13 @@ handle_refund_finished (void *cls,
     {
       ep = &exchange_pub;
       es = &exchange_sig;
+<<<<<<< HEAD
       TALER_amount_ntoh (&ra,
                          &rh->depconf.refund_fee);
       rf = &ra;
+=======
+      rf = &rh->depconf.refund_fee;
+>>>>>>> return fee as well
     }
     break;
   case MHD_HTTP_BAD_REQUEST:

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