-
Douwe Maan authored
Add merge conflict resolution to CHANGELOG
See merge request !58633e7f62b5
To find the state of this project's repository at the time of any of these versions, check out
the tags.
Add merge conflict resolution to CHANGELOGSee merge request !5863