NEWS: mention recent conflicts bugfix.
This commit is contained in:
parent
182e5bb421
commit
62f76e5497
Loading…
Reference in New Issue
Block a user