aboutsummaryrefslogtreecommitdiff
path: root/src/mint
diff options
context:
space:
mode:
Diffstat (limited to 'src/mint')
-rw-r--r--src/mint/taler-mint-httpd_admin.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/mint/taler-mint-httpd_admin.c b/src/mint/taler-mint-httpd_admin.c
index 373c444a1..99f256418 100644
--- a/src/mint/taler-mint-httpd_admin.c
+++ b/src/mint/taler-mint-httpd_admin.c
@@ -139,11 +139,8 @@ 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 !=