![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Thu, 18 Aug 2016 20:53:43 +0000 (22:53 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Thu, 18 Aug 2016 20:53:43 +0000 (22:53 +0200) | ||
| commit | 356901a4a8df5d6f40f9d03d2276d66fe9e13d17 | |
| tree | 5a5a96dfa74e970c02549994a56c1a1c31f1fa95 | tree | snapshot |
| parent | bc5073cf25c5cea3a322f70a3a9ba50c67460638 | commit | diff |
Changelog: fix unresolved merge conflict introduced in dc2eb04
Removed the conflict markers left over, and copy-pasted the changes
added in c0f5748.
Removed the conflict markers left over, and copy-pasted the changes
added in c0f5748.
| ChangeLog | diff | blob | history |