[BitPim-devel] Someone please fix

[William Hendricks]

I don't know how it got commited to the SVN, but on startup I get a long
message which, when boiled down shows the following:

\src\phones\p_lgvx8550.py", line 69
<<<<<<< .mine

Thanks in advance

[Mike Frysinger]

Post by William Hendricks
I don't know how it got commited to the SVN

how about the explanation: it wasnt

Post by William Hendricks
but on startup I get a long
\src\phones\p_lgvx8550.py", line 69
<<<<<<< .mine

you have local modifications that caused a conflict

read about conflicts in the subversion manual
-mike