-
Matt Behrens authored
Also remove conflict cruft that snuck into CHANGES.txt.
259e967f
To find the state of this project's repository at the time of any of these versions, check out
the tags.
Also remove conflict cruft that snuck into CHANGES.txt.