[Scribus] warning: cvs merge diff conflict

[bart at solozone.com]

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


Bart Alberti