fix indention, revert merge failures

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index bde168c..c2b3598 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1170,6 +1170,7 @@
 #<Plugin processes>
 #      CollectFileDescriptor true
 #      CollectContextSwitch true
+#      CollectMemoryMaps true
 #      Process "name"
 #      ProcessMatch "name" "regex"
 #      <Process "collectd">