grass64 startup error with wxpython

[neuba]

error while starting grass64 in wxpython. Here is the printed error. Traceback (most recent call last):

File "/usr/local/grass-6.4.0svn/etc/wxpython/wxgui.py", line 74, in <module>

from grass.script import core as grass

File "/usr/local/grass-6.4.0svn/etc/python/grass/init.py", line 1, in <module>

import script

File "/usr/local/grass-6.4.0svn/etc/python/grass/script/init.py", line 1, in <module>

from core import *

File "/usr/local/grass-6.4.0svn/etc/python/grass/script/core.py", line 236

>>>>>>> .merge-right.r37559

[hamish]

.merge-right.r37559

you had a conflict after 'svn up'. You need to edit, remove, or move away the wxgui.py file then 'svn resolved wxgui.py' and 'svn up' to restore it, and try try again.

Hamish

[martinl]

Replying to neuba:

error while starting grass64 in wxpython. Here is the printed error. Traceback (most recent call last): File "/usr/local/grass-6.4.0svn/etc/wxpython/wxgui.py", line 74, in <module> from grass.script import core as grass File "/usr/local/grass-6.4.0svn/etc/python/grass/init.py", line 1, in <module> import script File "/usr/local/grass-6.4.0svn/etc/python/grass/script/init.py", line 1, in <module> from core import * File "/usr/local/grass-6.4.0svn/etc/python/grass/script/core.py", line 236

.merge-right.r37559

[martinl]

Sorry bad commit, fixed in r37603. Thanks for reporting that.