Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 2843:f85495a566e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author ISHIKAWA MAI <c113017@e.koeki-u.ac.jp>
date Tue, 01 Dec 2015 18:46:30 +0900
parents 2e4df9792432
children 85a591bd771e
files syuzai/syuzai.html syuzai/tokusan/ichigiku.png syuzai/tokusan/ichiziku.png syuzai/tokusan/maccha.jpg syuzai/tokusan/mattya.jpg syuzai/tokusan/tomatojamu.jpg syuzai/tokusan/tomatojamu2.jpg syuzai/tokusan/tomatozyamu.jpg syuzai/tokusan/tomatozyamu2.jpg syuzai/tokusan/tyouri.html
diffstat 10 files changed, 22 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/syuzai/syuzai.html	Tue Dec 01 18:41:29 2015 +0900
+++ b/syuzai/syuzai.html	Tue Dec 01 18:46:30 2015 +0900
@@ -49,7 +49,13 @@
 <tr><th>もぐもぐ</th><th>移住情報</th><th>動物園</th><th>日替わりランチ
  </th><th>特産物</th><th>釣り情報</th>
 <tr><th><a href="rupo/rupo.html"><img
+<<<<<<< local
+     src="rupo/rupo1-150.jpg"></a></th><th><a
+     href="iturn/iturn.html"><img
+     src="iturn/i20091123-1450-00.jpg" hight="100" widht="150"></a></th>
+=======
      src="rupo/rupo1-150.jpg"></a></th><th><a href="./ijyuu.html"><img src="iturn/i20091123-1450-00.jpg" width="150" height="100"></a></th>
+>>>>>>> other
 
 <th><a href="zoo/index.html"><img src="zoo/domon_a.jpg" width="150" height="100"></a></th><th><a href="higawari/higawari.html"><img src="higawari/higawari.jpg"></a></th>
 <th><a href="tokusan/tokusan.html"><img src="tokusan/tokusan_top.jpg" width="150" height="100"></a></th><th><a href="dezima/dezima.html"><img src="dezima/dezima4-150.JPG"></a></th></tr></tr>
Binary file syuzai/tokusan/ichigiku.png has changed
Binary file syuzai/tokusan/ichiziku.png has changed
Binary file syuzai/tokusan/maccha.jpg has changed
Binary file syuzai/tokusan/mattya.jpg has changed
Binary file syuzai/tokusan/tomatojamu.jpg has changed
Binary file syuzai/tokusan/tomatojamu2.jpg has changed
Binary file syuzai/tokusan/tomatozyamu.jpg has changed
Binary file syuzai/tokusan/tomatozyamu2.jpg has changed
--- a/syuzai/tokusan/tyouri.html	Tue Dec 01 18:41:29 2015 +0900
+++ b/syuzai/tokusan/tyouri.html	Tue Dec 01 18:46:30 2015 +0900
@@ -12,10 +12,24 @@
 </head>
 
 <body>
-<h1>大見出し</h1>
-<p></p>
+<h1>庄内の特産物を使った料理を紹介します</h1>
+
+<p>赤ねぎ味噌</p>
+<p>おススメの食べ方は…</p>
+<p><img src="akanegimiso.jpg" width="150" height="100"></p>
 
+<p>ババロア</p>
+<p>おススメの食べ方は…</p>
+<p><img src="babaroa.jpg" width="150" height="100"></p>
 
+<p>漬け物</p>
+<p>おススメの食べ方は…</p>
+<p><img src="tukemono.jpg" width="150" height="100"></p>
+
+<p>トマトジャム</p>
+<p>おススメの食べ方は…</p>
+<p><img src="tomatojamu.jpg" width="150" height="100"></p>
+<p><img src="tomatojamu2.jpg" width="150" height="100"></p>
 
 </body>
 </html>

yatex.org