[Lunar-commits] CVS: moonbase/ftp/lftp CONFLICTS,1.2,NONE

[Terry Chan]

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

Removed Files:
	CONFLICTS 
Log Message:
There is NO conflict between tnftp and lftp.  tnftp install /usr/bin/ftp and
lftp installs /usr/bin/lftp.  Removed some extra set -x and set +x from
pure-ftpd/BUILD.


--- CONFLICTS DELETED ---