fix merge
[enigma2.git] / README