From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 20 Mar 2016 11:22:21 +0000 (+0100)
Subject: Fix conflict markers
X-Git-Tag: collectd-5.5.2~29
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=4fe146e337b55e4cbda726649ec2eb6db7c89c72;p=collectd.git

Fix conflict markers
---

diff --git a/src/write_http.c b/src/write_http.c
index 06a82fec..65197e6c 100644
--- 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);