aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mint/taler-mint-httpd_admin.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mint/taler-mint-httpd_admin.c b/src/mint/taler-mint-httpd_admin.c
index 1368fe05a..373c444a1 100644
--- a/src/mint/taler-mint-httpd_admin.c
+++ b/src/mint/taler-mint-httpd_admin.c
@@ -139,12 +139,18 @@ TMH_ADMIN_handler_admin_add_incoming (struct TMH_RequestHandler *rh,
json_decref (root);
if (GNUNET_OK != res)
{
+<<<<<<< HEAD
+ GNUNET_break_op (0);
+ json_decref (root);
+=======
+>>>>>>> 1bfba318ec0f3393de2dfc66821dec6165eef90a
return (GNUNET_SYSERR == res) ? MHD_NO : MHD_YES;
}
if (GNUNET_YES !=
TALER_json_validate_wireformat (TMH_expected_wire_formats,
wire))
{
+ GNUNET_break_op (0);
TMH_PARSE_release_data (spec);
return TMH_RESPONSE_reply_arg_unknown (connection,
"wire");