Re: Latest CVS won't build

[Pierre Abbat]

I looked at the file and found the following:

UT_Bool XAP_UnixApp::_loadFonts(void)
{
        // create a font manager for our app to use
<<<<<<< xap_UnixApp.cpp
        int RelativePathsSoFar,RelativePathCount;
=======
        UT_uint32 relativePathsSoFar = 0, relativePathCount = 0;
        
>>>>>>> 1.51
        m_fontManager = new XAP_UnixFontManager();
        UT_ASSERT(m_fontManager);

Obviously this will cause the compiler to choke. Is this some CVS markup, and
what does it mean?

phma