diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-05-19 01:18:37 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-05-19 01:18:37 +0200 |
| commit | 9e0cb7d91fddb95dead6056e542bb5aa584ab43a (patch) | |
| tree | 03e72931a697d21c8bd04a5b1bd2637e91ea76e6 | |
| parent | 863e7b4f5d97102555853055a03b65a30d53a888 (diff) | |
| parent | 65a782f6b188f3247865283c0fa831e57f0bdb40 (diff) | |
| download | exchange-9e0cb7d91fddb95dead6056e542bb5aa584ab43a.tar.gz exchange-9e0cb7d91fddb95dead6056e542bb5aa584ab43a.tar.bz2 exchange-9e0cb7d91fddb95dead6056e542bb5aa584ab43a.zip | |
merge
| -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 62f49598f..6f91389f1 100644 --- a/src/lib/exchange_api_refund.c +++ b/src/lib/exchange_api_refund.c @@ -177,13 +177,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: |