merging?

[Amir Karger]

Why do I get this when I do a cvs update?

RCS file: /usr/local/lyxsrc/cvsroot/lyx-1_0_x/po/lyx.pot,v
retrieving revision 1.67
retrieving revision 1.69
Merging differences between 1.67 and 1.69 into lyx.pot
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in po/lyx.pot
C po/lyx.pot


I don't think I've ever touched lyx.pot.

And what should I do to fix it?

-Ak