projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 356901a)
Changelog: fix unresolved merge conflict introduced in dc2eb04
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 18 Aug 2016 20:53:43 +0000 (22:53 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 18 Aug 2016 20:53:43 +0000 (22:53 +0200)
Removed the conflict markers left over, and copy-pasted the changes
added in c0f5748.


No differences found
collectd, the system statistics collection daemon