> The lines giving problems were: > <<<<<< .mine > ====== >>>>>>> .r535 > > Looking at the code, it seems like those lines are probably comments.
More precisely, they are Subversion's way of signalling a conflict
between a local change ("mine") and an external repository change (rev.
535). Conflicting changes need to be merged by hand.
Fortunately, this is easy to change :-)
Laurent.
signature.asc
Description: OpenPGP digital signature
