Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv7204 Log Message: Import from TNF Ports/index.html: 1.208 Misc/y2k.html: 1.30 Status: Vendor Tag: TNF Release Tags: date-2002-02-21 C htdocs/ja/Ports/index.html C htdocs/ja/Misc/y2k.html 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja