 it s this section of spamassassin raw spamassassin raw snip NUMBERd NUMBERd NUMBERd NUMBERd NUMBERd NUMBERd NUMBERd snip NUMBER NUMBER NUMBER NUMBER snip this is what cvs puts in when you modify the copy of the file on your disk and someone checks in a change and then you pull an update and cvs can t figure out how to merge your changes and the checked in changes the lines between the and the are in your file and the ones in the next section are what have been checked in you must have not noticed the warning messages about conflicts that cvs gave you when you did the update and the c flag next to that file when cvs listed the files being pulled sidney this URL email is sponsored by thinkgeek welcome to geek heaven URL _______________________________________________ spamassassin devel mailing list spamassassin devel URL URL 