[Qgis-community-team] ts file format

[Siki Zoltan]

Dear GUI translators,

I have just downloaded qgis from the trunk to updatemy GUI translation.
I used to usee QT Linguist for translation, but now QT Linguist doesn't 
open the ts file because of errors in the file. I have several lines with
<<<<<<< .mine
>>>>>>> .r12010
=======
No other ts language file contains such lines.

Do you know why I get those lines?

Regards,
Zoltan