1 commit

Author	SHA1	Message	Date
John Backus	de5fb378ac	Change merge driver for Changelog.md to union ... See bbatsov/rubocop#3594 for context on what this is and how it works	2016-10-16 18:57:00 -07:00