From: chris <chris>
Date: Thu, 24 Oct 2002 05:41:39 +0000 (+0000)
Subject: Merged conflict.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=13ab27fc54a258cdd89098d1fcb7654de1c612e5;p=www%2Fchise.git

Merged conflict.
---

diff --git a/index.html.en b/index.html.en
index 9a267bd..8e2142d 100644
--- a/index.html.en
+++ b/index.html.en
@@ -22,6 +22,9 @@ Kyoto University, Institute for Research in Humanities, Documentation
 </table>
 </h1>
 <p>
+<!-- hhmts start -->
+Last modified: Fri Sep 27 00:30:59 JST 2002
+<!-- hhmts end -->
 <br>
 <b><a href="index.html.ja.iso-2022-jp"><img
 src="images/japanese-page.png">