On Thursday 24 February 2005 01:09, bart at solozone.com wrote: > In what shows as the Feb 19 1.2.2cvs, as of today, Wed Feb 23, 2005, I get > the following > > > P Scribus/scribus/plugins/scriptplugin/objpdffile.cpp > RCS file: /cvs/Scribus/scribus/plugins/scriptplugin/scripterprefs.cpp,v > retrieving revision 1.3 > retrieving revision 1.4 > Merging differences between 1.3 and 1.4 into scripterprefs.cpp > rcsmerge: warning: conflicts during merge > cvs update: conflicts found in > Scribus/scribus/plugins/scriptplugin/scripterprefs.cpp C > Scribus/scribus/plugins/scriptplugin/scripterprefs.cpp > P Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
Nuke the scripterprefs.cpp and grab it again. Craig -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available Url : http://nashi.altmuehlnet.de/pipermail/scribus/attachments/20050224/c0b27973/attachment.pgp
