[dev] error in mailbox.php line 143

[Jan Schneider]

Zitat von Pavel Chytil <pchytil@asp.ogi.edu>:

> Well my update of cvs did wrong lines in it. (>>>>>>>>>>> mailbox.php and 
> <<<<<<<<<< mailbox.php) I corrected by myself, but it looked like it's
> comming 
> from cvs, but it is not. I deleted the file and did update and it is fine
> know.

These kind of lines are created by your local cvs client if you did changes in 
the same line where one of the developers changes some code.

Jan.