projects / collectd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bc5073c) | patch
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)
commit356901a4a8df5d6f40f9d03d2276d66fe9e13d17
tree5a5a96dfa74e970c02549994a56c1a1c31f1fa95tree | snapshot
parentbc5073cf25c5cea3a322f70a3a9ba50c67460638commit | diff
Changelog: fix unresolved merge conflict introduced in dc2eb04

Removed the conflict markers left over, and copy-pasted the changes
added in c0f5748.
ChangeLog diff | blob | history
collectd, the system statistics collection daemon