[Lunar-commits] CVS: moonbase/zbeta/gift-cvs CONFLICTS,NONE,1.1

[Florin Braescu]

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

Added Files:
	CONFLICTS 
Log Message:
add the needed CONFLICTS file.


--- NEW FILE: CONFLICTS ---
conflicts gift