aboutsummaryrefslogtreecommitdiff
path: root/src/lib/exchange_api_refund.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/exchange_api_refund.c')
-rw-r--r--src/lib/exchange_api_refund.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c
index 62f49598f..6f91389f1 100644
--- a/src/lib/exchange_api_refund.c
+++ b/src/lib/exchange_api_refund.c
@@ -177,13 +177,9 @@ 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
181 TALER_amount_ntoh (&ra, 180 TALER_amount_ntoh (&ra,
182 &rh->depconf.refund_fee); 181 &rh->depconf.refund_fee);
183 rf = &ra; 182 rf = &ra;
184=======
185 rf = &rh->depconf.refund_fee;
186>>>>>>> return fee as well
187 } 183 }
188 break; 184 break;
189 case MHD_HTTP_BAD_REQUEST: 185 case MHD_HTTP_BAD_REQUEST: