projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge upstream, address conflict in src/utils/cmds/cmds_test.c
[collectd.git]
/
src
/
email.c
diff --git
a/src/email.c
b/src/email.c
index
f8a94fb
..
deb6600
100644
(file)
--- a/
src/email.c
+++ b/
src/email.c
@@
-40,8
+40,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <stddef.h>
#include <stddef.h>