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