That is no error.
What you have there is a conflict message from SVN.
the part before ====== was what your modified version had there, the part after is the one that is from the Revision 33 version of maxgui
What you have there is a conflict message from SVN.
the part before ====== was what your modified version had there, the part after is the one that is from the Revision 33 version of maxgui