Update of /cvsroot/htdocs/ja/Ports/x68k In directory mogu:/tmp/cvs-serv4502 Log Message: Import from TNF Status: Vendor Tag: TNF Release Tags: date-2001-06-04 C htdocs/ja/Ports/x68k/index.html C htdocs/ja/Ports/x68k/news.html 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja/Ports/x68k