mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Remove merge marker from CHANGES
This commit is contained in:
parent
01f8dad160
commit
3261b87cf5