diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-09-28 15:27:04 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-09-28 15:27:04 +0200 |
| commit | da04a98358854714b9e302c68f6bd285cacfdc32 (patch) | |
| tree | aa25d2c6e9c5da82e462d386f5f6764acd3d4143 /src/mint | |
| parent | 0e48396f7e59ef1c2ab0bc00e0a828d26d6bbc75 (diff) | |
| download | exchange-da04a98358854714b9e302c68f6bd285cacfdc32.tar.gz exchange-da04a98358854714b9e302c68f6bd285cacfdc32.tar.bz2 exchange-da04a98358854714b9e302c68f6bd285cacfdc32.zip | |
resolve conflict
Diffstat (limited to 'src/mint')
| -rw-r--r-- | src/mint/taler-mint-httpd_admin.c | 3 |
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 != |