sp...@lyx.org wrote: > Author: spitz > Date: Mon Jan 3 21:53:37 2011 > New Revision: 37090 > URL: http://www.lyx.org/trac/changeset/37090 > > Log: > * nn.po: revert to previous. Something is fishy.
> "Plural-Forms: nplurals=2; plural=n != 1;\n" > -"Language: nn" > +<<<<<<< .mine > +"Language: nn\n" > +======= > +>>>>>>> .r37085 Juergen, you seem to have branch with merge conflicts. pavel
