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
/
notify_desktop.c
diff --git
a/src/notify_desktop.c
b/src/notify_desktop.c
index
4840441
..
266c77c
100644
(file)
--- a/
src/notify_desktop.c
+++ b/
src/notify_desktop.c
@@
-30,8
+30,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <glib.h>
#include <libnotify/notify.h>
#include <glib.h>
#include <libnotify/notify.h>
@@
-166,5
+166,3
@@
void module_register(void) {
plugin_register_init("notify_desktop", c_notify_init);
return;
} /* module_register */
plugin_register_init("notify_desktop", c_notify_init);
return;
} /* module_register */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */