Fix conflict markers

diff --git a/src/write_http.c b/src/write_http.c
index 06a82fec5c6ff9fd7e700c4c74aa00649522c4c6..65197e6c64f1fcedda9e4b75a52a82ffe49860a5 100644 (file)
--- a/src/write_http.c
+++ b/src/write_http.c
@@ -541,14 +541,10 @@ static int wh_config_node (oconfig_item_t *ci) /* {{{ */
         cb->verify_peer = 1;
         cb->verify_host = 1;
         cb->format = WH_FORMAT_COMMAND;
-<<<<<<< HEAD
         cb->sslversion = CURL_SSLVERSION_DEFAULT;
         cb->low_speed_limit = 0;
         cb->timeout = 0;
-=======
-        cb->curl = NULL;
         cb->headers = NULL;
->>>>>>> collectd-5.4
 
         pthread_mutex_init (&cb->send_lock, /* attr = */ NULL);