Some problem in control-center:capplets/ui-properties/mdi.desktop

[<simos pc96 ma rhbnc ac uk>]

The text of the file reads:

...
Name[gl]=Multi-Documento
Name[ja]=MDI
Name[ko]=&OHacgr;©·—&EEacgr;®&Oacgr;­
<<<<<<< mdi.desktop
Name[lt]=MDI
Name[no]=Multidokument
=======
Name[no]=MDI
>>>>>>> 1.14.2.6
Name[pl]=MDI
Name[pt]=MDI
Name[sv]=MDI
...

I assume the <<< and >>> lines should not be there.
I did not fix it. Perhaps someone else would like to have a look at it.
It is in the control-center-1-0 branch.

simos