CVS: moonbase/zbeta/xffm4-cvs CONFLICTS,NONE,1.1

[jasper at lunar-linux.org]

Update of /var/cvs/lunar/moonbase/zbeta/xffm4-cvs
In directory dbguin.lunar-linux.org:/tmp/cvs-serv21533/xffm4-cvs

Added Files:
	CONFLICTS 
Log Message:
Add proper conflicts with stable version

--- NEW FILE: CONFLICTS ---
conflicts xffm