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

[Florin Braescu]

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

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


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