Merge conflict leftover in CHANGES.txt

[Markus Schuch]

Hi Karl,

looks like a merge went wrong in CHANGES.txt (line 35 in trunk)

Came in with r1784298

Regards,
Markus

---
Diese E-Mail wurde von Avast Antivirus-Software auf Viren geprüft.
https://www.avast.com/antivirus