changeset 1987:f76278861423

merged
author HIROSE Yuuji <ta01002@e.koeki-u.ac.jp>
date Wed, 24 Jul 2013 15:51:57 +0900
parents 3a3e197b5d6a (current diff) 115be9a244c6 (diff)
children 113e438c08f2
files
diffstat 1 files changed, 29 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/staff/chokai/index.html	Wed Jul 24 15:51:57 2013 +0900
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>インデックス</title>
+<style type="text/css">
+<!--
+
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="../../skip.css">
+</head>
+
+<body>
+<h1>鳥海山に登ろう<h1>
+<p>四季明瞭、自然豊か、登りやすい、三拍子揃っています。</p>
+
+
+hg pull -uv
+hg merge
+hg ci -m merged
+ 
+hg pull
+
+
+<address>c110128&#x40;f.koeki-u.ac.jp</address>
+
+</body>
+</html>

yatex.org