summaryrefslogtreecommitdiff
path: root/src/lib/exchange_api_refund.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-05-05 22:17:16 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-05 16:50:12 +0200
commit15daa781271387bb0799b59f9da51563b24fa723 (patch)
tree377e462cb1f4af14f4eec287bd98ea0f792536cb /src/lib/exchange_api_refund.c
parent532440acf829f794fec93952da889ca015559bb4 (diff)
downloadexchange-15daa781271387bb0799b59f9da51563b24fa723.tar.gz
exchange-15daa781271387bb0799b59f9da51563b24fa723.tar.bz2
exchange-15daa781271387bb0799b59f9da51563b24fa723.zip
return fee as well
Diffstat (limited to 'src/lib/exchange_api_refund.c')
-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 1af1f14b..687dbdae 100644
--- a/src/lib/exchange_api_refund.c
+++ b/src/lib/exchange_api_refund.c
@@ -178,9 +178,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: