exchange

commit da04a98358854714b9e302c68f6bd285cacfdc32
parent 0e48396f7e59ef1c2ab0bc00e0a828d26d6bbc75
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 28 Sep 2015 15:27:04 +0200

resolve conflict

Diffstat:
M
src/mint/taler-mint-httpd_admin.c
 | 
3
---

1 file changed, 0 insertions(+), 3 deletions(-)
diff --git 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 !=