Update of /cvsroot/htdocs/ja/Sites In directory mogu:/tmp/cvs-serv15041 Log Message: Import TNF cdroms.list 1.121 Status: Vendor Tag: TNF Release Tags: date-2002-09-09 C htdocs/ja/Sites/cdroms.list 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja/Sites