taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
Christian Grothoff 2015-09-28 15:27:04 +02:00
parent 0e48396f7e
commit da04a98358
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mint/taler-mint-httpd_admin.c
View File

@ -139,11 +139,8 @@ TMH_ADMIN_handler_admin_add_incoming (struct TMH_RequestHandler *rh,
json_decref (root); json_decref (root);
if (GNUNET_OK != res) if (GNUNET_OK != res)
{ {
<<<<<<< HEAD
GNUNET_break_op (0); GNUNET_break_op (0);
json_decref (root); json_decref (root);
=======
>>>>>>> 1bfba318ec0f3393de2dfc66821dec6165eef90a
return (GNUNET_SYSERR == res) ? MHD_NO : MHD_YES; return (GNUNET_SYSERR == res) ? MHD_NO : MHD_YES;
} }
if (GNUNET_YES != if (GNUNET_YES !=