Mercurial > hgrepos > hgweb.cgi > skipweb
changeset 958:64601e656493
merge
author | HAGITA Akane<c113133@e.koeki-u.ac.jp> |
---|---|
date | Tue, 17 Nov 2015 19:04:04 +0900 |
parents | 1b6b582abfb8 |
children | ad9a05f8f464 |
files | syuzai/tokusan/tokusan.html |
diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/syuzai/tokusan/tokusan.html Tue Nov 17 18:54:38 2015 +0900 +++ b/syuzai/tokusan/tokusan.html Tue Nov 17 19:04:04 2015 +0900 @@ -6,7 +6,7 @@ <title>特産物</title> <link rel="stylesheet" type="text/css" href="kagetsu.css"> </head> - +<link rel="stylesheet" type="text/css"href="../../skip.css"> <body> <h1>庄内の特産物を紹介するよ!</h1> <h2>取材レポート</h2> @@ -49,10 +49,7 @@ <h1><img src="kyuri.jpg"></h1> <h1><img src="satsumaimo.jpg"></h1> <h1><img src="babaroa.jpg"></h1> -<h1><img src=""></h1> -<h1><img src=""></h1> -<h1><img src=""></h1> -<h1><img src=""></h1> + ======= >>>>>>> other <h1>おもしろい物がたくさんあったよ!みんな行ってみてね!</h1>