From 15daa781271387bb0799b59f9da51563b24fa723 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 5 May 2020 22:17:16 +0200
Subject: return fee as well

---
 src/lib/exchange_api_refund.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/lib/exchange_api_refund.c')

diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c
index 1af1f14b9..687dbdae1 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:
-- 
cgit v1.2.3