On Sat, Jun 21, 2008 at 6:07 PM, Dominique Louis
<[EMAIL PROTECTED]> wrote:
> Within Mac OS X Carbon IDE, any time I try to create an event it send me
> to the osutilsh.inc file, to line 40 where it says
> <<<<<<< .mine
>
> Any ideas?

This is what appears when you have modifyed a file and then you do a
svn update and there is a conflict which svn could not resolve.

I would remove the file and get it again with svn update.

-- 
Felipe Monteiro de Carvalho
_______________________________________________
Lazarus mailing list
Lazarus@lazarus.freepascal.org
http://www.lazarus.freepascal.org/mailman/listinfo/lazarus

Reply via email to