release-notes: fixup bad conflict resolution in bef6bef
/cc #19324.
Vladimír Čunát 9 years ago 54a76b3f af38c055