merge

2020-07-05 16:51:54 +02:00 · 2020-07-05 16:51:54 +02:00 · 042e5cafd7
commit 042e5cafd7
parent 6eb32a65bf b145c1728b
1 changed files with 0 additions and 4 deletions
--- 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: