From 1b7c41ecbb80f669974e1b0592cb6e93439f410f Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 22 Jan 2018 17:42:12 +0100 Subject: [PATCH] -fix unsafed file --- src/rest/gnunet-rest-server.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c index a67b3203a..ea8108f3a 100644 --- a/src/rest/gnunet-rest-server.c +++ b/src/rest/gnunet-rest-server.c @@ -398,12 +398,10 @@ create_response (void *cls, MHD_GET_ARGUMENT_KIND, &url_iterator, rest_conndata_handle); -<<<<<<< HEAD MHD_get_connection_values (con, MHD_HEADER_KIND, &header_iterator, rest_conndata_handle); -======= con_handle->pp = MHD_create_post_processor(con, 4000, post_data_iter, @@ -416,7 +414,6 @@ create_response (void *cls, { MHD_destroy_post_processor(con_handle->pp); } ->>>>>>> master con_handle->state = GN_REST_STATE_PROCESSING; con_handle->plugin->process_request (rest_conndata_handle, &plugin_callback, -- 2.25.1