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-05-19 01:18:37 +02:00
commit 9e0cb7d91f
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

@ -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: