The first email was received too.

Edit the file /mk/buildlink3/bsd.buildlink3.mk.
Find the lines like this:


<<<<<

old

=====

new

>>>>>

Remove the first (old) section and the angle bracket characters and the 
equal signs.

Or delete the file and grab it again.

Or if you really want the old changes then manually edit it.

This was probably caused because I provided a quick hack to find a problem 
(that you applied yourself)  and then jlam also patched exact same code 
(to CVS).


 Jeremy C. Reed

echo '9,J8HD,fDGG8B@?:536FC5=8@I;C5?@H5B0D@5GBIELD54DL>@8L?:5GDEJ8LDG1' |\
sed ss,s50EBsg | tr 0-M 'p.wBt SgiIlxmLhan:o,erDsduv/cyP'