return fee as well

2020-05-05 22:17:16 +02:00 · 2020-05-05 22:17:16 +02:00 · 5a4547388b
commit 5a4547388b
parent f88fd4640f
1 changed files with 4 additions and 0 deletions
--- 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: