Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv7038 Modified Files: index.html Log Message: resolve conflicts