exchange

commit 042e5cafd7b7748dafc5ce243267dc73abd45df7
parent 6eb32a65bf67438159fb1b6e3cf404b8721784ee
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun,  5 Jul 2020 16:51:54 +0200

merge

Diffstat:
M
src/lib/exchange_api_refund.c
 | 
4
----

1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c
@@ -178,13 +178,9 @@ 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: