This is caused by merge problem: You had something in this
file which CVS could not merge into the updated version. Your
best bet is to rename this file and do a "cvs update cs.po"
- this will just get this one file from the cvs server.
After that you can try to figure out what the differences
between your old file and the new/corrected file are.
On Sat, Jul 08, 2000 at 03:01:19PM -0700, pixel fairy wrote:
> below is the error message, while looking in cs.po i found,
> 326 <<<<<<< cs.po
> 333 =======
> 340 >>>>>>> 1.34
> 387 <<<<<<< cs.po
> 391 =======
> and at 392 there was another >>>>>>> 1.34 but it was not listed as a parse
> 516 <<<<<<< cs.po
> 522 =======
[ ... ]