1 commit

Author	SHA1	Message	Date
jobevers	847a79f526	use union merge on CHANGELOG.md ... http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/	2017-02-20 21:37:50 -06:00