3 commits

Author	SHA1	Message	Date
Mads Marquart	2cc87cab65	Update changelog guidelines to prevent conflicts from blocking PRs (#2145) ... * Update changelog guidelines to prevent conflicts from blocking PRs As per consensus in https://github.com/rust-windowing/winit/issues/2135 * Add note about whitespace in changelog * Add note about maintainer creating new tag	2022-01-23 13:55:33 +01:00
Osspial	2e0bbc091f	Set CHANGELOG.md merge style to union (#919)	2019-06-13 16:11:44 -04:00
Tomaka17	1cc0447c5e	Initial commit	2014-07-27 11:41:26 +02:00