>> Amir Karger writes:
AK> Why do I get this when I do a cvs update? RCS file:
AK> /usr/local/lyxsrc/cvsroot/lyx-1_0_x/po/lyx.pot,v retrieving
AK> revision 1.67 retrieving revision 1.69 Merging differences
AK> between 1.67 and 1.69 into lyx.pot rcsmerge: warning: conflicts
AK> during merge cvs server: conflicts found in po/lyx.pot C
AK> po/lyx.pot
AK> I don't think I've ever touched lyx.pot.
The make process updates lyx.pot.
AK> And what should I do to fix it?
Delete po/lyx.pot and to cvs update again.
(cd po ; cvs update )
Lgb
