summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-05-05 22:17:16 +0200
committerChristian Grothoff <christian@grothoff.org>2020-05-19 01:16:29 +0200
commit5a4547388bae6713e8786e1c527e7eec5ee0abb3 (patch)
tree0bc706ab154f0c4c2fb687cc57fb9a1225a1ff9e
parentf88fd4640fbf1fdbead38f826bbdb5f6f41e4565 (diff)
downloadexchange-5a4547388bae6713e8786e1c527e7eec5ee0abb3.tar.gz
exchange-5a4547388bae6713e8786e1c527e7eec5ee0abb3.tar.bz2
exchange-5a4547388bae6713e8786e1c527e7eec5ee0abb3.zip
return fee as well
-rw-r--r--src/lib/exchange_api_refund.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c
index 6f91389f1..62f49598f 100644
--- a/src/lib/exchange_api_refund.c
+++ b/src/lib/exchange_api_refund.c
@@ -177,9 +177,13 @@ 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: