Update of /var/cvs/lunar/moonbase/zbeta/xfdesktop-cvs In directory dbguin.lunar-linux.org:/tmp/cvs-serv21533/xfdesktop-cvs Added Files: CONFLICTS Log Message: Add proper conflicts with stable version --- NEW FILE: CONFLICTS --- conflicts xfdesktop