fix merge conflict.
[enigma2.git] / ChangeLog