taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Christian Grothoff 2020-07-05 16:51:54 +02:00
commit 042e5cafd7
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/exchange_api_refund.c
View File

@ -178,13 +178,9 @@ handle_refund_finished (void *cls,
{ {
ep = &exchange_pub; ep = &exchange_pub;
es = &exchange_sig; es = &exchange_sig;
<<<<<<< HEAD
TALER_amount_ntoh (&ra, TALER_amount_ntoh (&ra,
&rh->depconf.refund_fee); &rh->depconf.refund_fee);
rf = &ra; rf = &ra;
=======
rf = &rh->depconf.refund_fee;
>>>>>>> return fee as well
} }
break; break;
case MHD_HTTP_BAD_REQUEST: case MHD_HTTP_BAD_REQUEST: