[ pyopengl-Bugs-2019593 ] vbo_junk.py contains diff conflict statements

Bugs item #2019593, was opened at 2008-07-16 10:44
Message generated for change (Comment added) made by mcfletch
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=105988&aid=2019593&group_id=5988

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: install
Group: None
>Status: Closed
>Resolution: Fixed
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
>Assigned to: Mike C. Fletcher (mcfletch)
Summary: vbo_junk.py contains diff conflict statements

Initial Comment:
In release 3.0.0b4 diff statements (e.g. >>>>>>>>) can be found in OpenGL/arrays/vbo_junk.py preventing installation.

----------------------------------------------------------------------

>Comment By: Mike C. Fletcher (mcfletch)
Date: 2008-07-19 20:46

Message:
Logged In: YES 
user_id=34901
Originator: NO

Thanks for the heads-up.  The junk file was intended to be deleted, of
course.

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=105988&aid=2019593&group_id=5988

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
PyOpenGL Homepage
http://pyopengl.sourceforge.net