Trivial conflict in release notes, except that the xml/docbook parts are horrible for (semi-)automatic conflict resolution. Fortunately that's generated anyway.
Trivial conflict in release notes, except that the xml/docbook parts are horrible for (semi-)automatic conflict resolution. Fortunately that's generated anyway.