projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix a couple of typos spotted by Debian's lintian tool
[collectd.git]
/
src
/
write_http.c
diff --git
a/src/write_http.c
b/src/write_http.c
index
06a82fe
..
65197e6
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;
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->sslversion = CURL_SSLVERSION_DEFAULT;
cb->low_speed_limit = 0;
cb->timeout = 0;
-=======
- cb->curl = NULL;
cb->headers = NULL;
cb->headers = NULL;
->>>>>>> collectd-5.4
pthread_mutex_init (&cb->send_lock, /* attr = */ NULL);
pthread_mutex_init (&cb->send_lock, /* attr = */ NULL);