Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv7295 Log Message: Import from TNF. Status: Vendor Tag: TNF Release Tags: date-2001-11-23 C htdocs/ja/Ports/i386/index.html C htdocs/ja/contrib/donations.list C htdocs/ja/contrib/index.html 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja