diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-07-05 16:51:54 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-07-05 16:51:54 +0200 |
| commit | 042e5cafd7b7748dafc5ce243267dc73abd45df7 (patch) | |
| tree | 296a9c40d1b0e59115f2bc5c18bddc25f4cbf84e /src/lib | |
| parent | 6eb32a65bf67438159fb1b6e3cf404b8721784ee (diff) | |
| parent | b145c1728b4dfb4f45cfcb7adb86605002e6ad5d (diff) | |
merge
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/exchange_api_refund.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c index 687dbdae1..1af1f14b9 100644 --- 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: |