diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-05-05 22:17:16 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-05-19 01:16:29 +0200 |
commit | 5a4547388bae6713e8786e1c527e7eec5ee0abb3 (patch) | |
tree | 0bc706ab154f0c4c2fb687cc57fb9a1225a1ff9e | |
parent | f88fd4640fbf1fdbead38f826bbdb5f6f41e4565 (diff) | |
download | exchange-5a4547388bae6713e8786e1c527e7eec5ee0abb3.tar.gz exchange-5a4547388bae6713e8786e1c527e7eec5ee0abb3.zip |
return fee as well
-rw-r--r-- | src/lib/exchange_api_refund.c | 4 |
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, | |||
177 | { | 177 | { |
178 | ep = &exchange_pub; | 178 | ep = &exchange_pub; |
179 | es = &exchange_sig; | 179 | es = &exchange_sig; |
180 | <<<<<<< HEAD | ||
180 | TALER_amount_ntoh (&ra, | 181 | TALER_amount_ntoh (&ra, |
181 | &rh->depconf.refund_fee); | 182 | &rh->depconf.refund_fee); |
182 | rf = &ra; | 183 | rf = &ra; |
184 | ======= | ||
185 | rf = &rh->depconf.refund_fee; | ||
186 | >>>>>>> return fee as well | ||
183 | } | 187 | } |
184 | break; | 188 | break; |
185 | case MHD_HTTP_BAD_REQUEST: | 189 | case MHD_HTTP_BAD_REQUEST: |