[Boa Constr] <<<<<<< syntax in Boa.py,v 1.29

[Ray S. <rj...@bl...>]

I have a menu issue with 0.1.0, so I tried the CVS version which now pukes on:

<<<<<<< Boa.py
if (wxMAJOR_VERSION, wxMINOR_VERSION) != (2, 3):
=======
if (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) <
__version__.wx_version:
>>>>>>> 1.29

and other similar lines. I'm not familiar with the <<<<<<<, =======, and
>>>>>>> syntax...
I'm running xwPython 2.3.2.1 and Python 2.2 (#28, Dec 21 2001, 12:21:22).


Ray Schumacher
Blue Cove Interactive - Services
http://Blue-Cove.com