CVS Conflict markers in the w3m script

[SpamapS]

Wasn't sure where to send this. Julian, I hope you see this:

http://www.spamcop.net/w3m?action=inprogress

Has this in the view source:

<<<<<<< w3mod

<th>Abuse report sent to</th><th>Age</th><th>Issue</th>

</tr>

=======

<th>Abuse report sent to</th><th>Age</th><th>

>>>>>>> 1.80

Oops! resolve those conflicts! ;-)

-cb

[Wazoo]

Julian doesn't spend time in here as a general rule. I moved your post from Help to the Lounge, then kicked an e-mail upstream. Again, the general practice is that if Julian gets around to it, does see an error, it gets fixed and he moves on ... so the notification is that the error just disappears.