Subject: Re: Latest CVS won't build
From: Pierre Abbat (phma@oltronics.net)
Date: Fri Aug 25 2000 - 05:27:59 CDT
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
This archive was generated by hypermail 2b25 : Fri Aug 25 2000 - 05:38:01 CDT