Problem with documentation in CVS version

Hi,

There is a problem with documentation in the CVS version.

The offending documentation is in lush-intro.hlp

This was a file that I revised previously and committed to the experimental branch.
It was subsequently merged into the main branch. 

Either merging was incorrectly done or some syntax in the file must be in conflict 
with CVS operations that results in merge/diff marks being inserted (which
won't work in helptool, of course).

I compared the two files, but it is not immediately obvious to me why the problem exists.

Thanks.

Raymond

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642