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?
Dominique.
Mailing lists / lazarus / 2008-06
Mac OS X : Carbon IDE unable to create events..
4 messages · 3 people ·
- Dominique Louis 2
- Felipe Monteiro de Carvalho 1
- Vincent Snijders 1
Reply by email Subscribe to this list Your subscription
Read-only archive. Use j and k to move between messages.
Dominique Louis wrote 5 lines
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
Within Mac OS X Carbon IDE, any time I try to create an event it send me to the…
Dominique Louis wrote 5 lines
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
You have an svn conflict. svn revert that file.
Vincent
Within Mac OS X Carbon IDE, any time I try to create an event it send me to the…
Thanks Felipe and Vincent, it working again now after the svn update.
Dominique Louis wrote 8 lines
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?
Dominique.