Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 3063:5267b19f26ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author GOTO Sakuya <c113061@e.koeki-u.ac.jp>
date Tue, 15 Dec 2015 19:00:56 +0900
parents 2aa3d50eb0ac (current diff) c8cd31808952 (diff)
children 5b101876b53e
files
diffstat 19 files changed, 38 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
Binary file shuzai/fishing/fishing0.JPG has changed
Binary file shuzai/fishing/fishing10.JPG has changed
Binary file shuzai/fishing/fishing11.JPG has changed
Binary file shuzai/fishing/fishing3.JPG has changed
Binary file shuzai/fishing/fishing4(2).JPG has changed
Binary file shuzai/fishing/fishing4.JPG has changed
Binary file shuzai/fishing/fishing5.JPG has changed
Binary file shuzai/fishing/fishing6.JPG has changed
Binary file shuzai/fishing/fishing7.JPG has changed
Binary file shuzai/fishing/fishing8.JPG has changed
Binary file shuzai/fishing/fishing9.JPG has changed
--- a/shuzai/tokusan/akanegimiso.html	Tue Dec 15 18:59:28 2015 +0900
+++ b/shuzai/tokusan/akanegimiso.html	Tue Dec 15 19:00:56 2015 +0900
@@ -7,15 +7,16 @@
 
 
 </style>
-<link rel="stylesheet" type="text/css" href="main.css">
+<link rel="stylesheet" type="text/css" href="tokusan.css">
 </head>
 
 <body>
 <h1>赤ねぎ味噌</h1>
+<p>ご飯だけでなく豆腐にのせたり、お湯で溶かして味噌汁もできる万能味噌！</p>
 
 <p><img src="akanegimiso.jpg" alt="赤ねぎ味噌"></p>
 
-<p>ご飯だけでなく豆腐にのせたり、お湯で溶かして味噌汁もできる万能味噌！</p>
+
 
 </body>
 </html>
--- a/shuzai/tokusan/babaroa.html	Tue Dec 15 18:59:28 2015 +0900
+++ b/shuzai/tokusan/babaroa.html	Tue Dec 15 19:00:56 2015 +0900
@@ -12,7 +12,7 @@
 
 -->
 </style>
-<link rel="stylesheet" type="text/css" href="main.css">
+<link rel="stylesheet" type="text/css" href="tokusan.css">
 </head>
 
 <body>
--- a/shuzai/tokusan/kudamono.html	Tue Dec 15 18:59:28 2015 +0900
+++ b/shuzai/tokusan/kudamono.html	Tue Dec 15 19:00:56 2015 +0900
@@ -16,15 +16,43 @@
 <div class="iconmenu">
 <!--登録店舗一覧の枠-->
 
+<<<<<<< local
+<div><p>ぶどう[スチューベン]</p><p><a href="budou.html"><img
+src="budou_i.jpg"alt="ぶどう[スチューベ
+ン]"width="150"hight="100"></a></p></div>
+=======
 <div><p>ぶどう[スチューベン]</p><p><a href="budou.html"><img src="budou_i.jpg"alt="ぶどう[スチューベン]"width="150"hight="100"></a></p></div>
+>>>>>>> other
 
+<<<<<<< local
+<div><p>庄内柿</p><p><a href="kaki.html"><img src="kaki_i.jpg"alt="ぶど
+う"width="150"hight="100"></a></p></div>
+=======
 <div><p>庄内柿</p><p><a href="kaki.html"><img src="kaki_i.jpg"alt="ぶどう"width="150"hight="100"></a></p></div>
+>>>>>>> other
 
+<<<<<<< local
+<div><p>庄内砂丘メロン</p><p><a
+href="meron.html"><img
+src="meron_i.jpg"alt=""width="150"hight="100"></a></p></div>
+=======
 <div><p>庄内砂丘メロン</p><p><a href="meron.html"><img src="meron_i.jpg"alt=""width="150"hight="100"></a></p></div>
+>>>>>>> other
 
+<<<<<<< local
+<div><p>梨</p><p><a href="nashi.html"><img
+src="nashi_i.jpg"alt="梨"width="150"hight="100"></a></p></div>
+=======
 <div><p>梨</p><p><a href="nashi.html"><img src="nashi_i.jpg"alt="梨"width="150"hight="100"></a></p></div>
+>>>>>>> other
 
+<<<<<<< local
+<div><p>リンゴ</p><p><a
+href="ringo.html"><img
+src="ringo_i.jpg"alt=""width="150"hight="100"></a></p></div>
+=======
 <div><p>リンゴ</p><p><a href="ringo.html"><img src="ringo_i.jpg"alt=""width="150"hight="100"></a></p></div>
+>>>>>>> other
 
 <div><p><img src=""alt=""width=""hight=""></p></div>
 
--- a/shuzai/tokusan/kudamono_akebi.html	Tue Dec 15 18:59:28 2015 +0900
+++ b/shuzai/tokusan/kudamono_akebi.html	Tue Dec 15 19:00:56 2015 +0900
@@ -6,7 +6,7 @@
 <style type="text/css">
 
 </style>
-<link rel="stylesheet" type="text/css" href="main.css">
+<link rel="stylesheet" type="text/css" href="tokusan.css">
 </head>
 
 <body>
--- a/shuzai/tokusan/meron.html	Tue Dec 15 18:59:28 2015 +0900
+++ b/shuzai/tokusan/meron.html	Tue Dec 15 19:00:56 2015 +0900
@@ -7,11 +7,11 @@
 <style type="text/css">
 
 </style>
-<link rel="stylesheet" type="text/css" href="main.css">
+<link rel="stylesheet" type="text/css" href="tokusan.css">
 </head>
 
 <body>
-<h1>庄内砂丘メロン</h1>
+<h1>メロンジャム</h1>
 <p>（収穫時期：アンデスメロン6月中旬~8月初旬）<br>
 きめ細かい肉質となめらかな舌触りは庄内砂丘メロンの特徴です。糖度の高さと
 網目が自慢です！豊富なミネラルは血圧を正常に戻す作用があり、美容にも良い
--- a/shuzai/tokusan/tomatojamu.html	Tue Dec 15 18:59:28 2015 +0900
+++ b/shuzai/tokusan/tomatojamu.html	Tue Dec 15 19:00:56 2015 +0900
@@ -12,7 +12,7 @@
 
 -->
 </style>
-<link rel="stylesheet" type="text/css" href="main.css">
+<link rel="stylesheet" type="text/css" href="tokusan.css">
 </head>
 
 <body>
--- a/shuzai/tokusan/tsukemono.html	Tue Dec 15 18:59:28 2015 +0900
+++ b/shuzai/tokusan/tsukemono.html	Tue Dec 15 19:00:56 2015 +0900
@@ -13,7 +13,7 @@
 
 -->
 </style>
-<link rel="stylesheet" type="text/css" href="main.css">
+<link rel="stylesheet" type="text/css" href="tokusan.css">
 </head>
 
 <body>
--- a/shuzai/tokusan/tyouri.html	Tue Dec 15 18:59:28 2015 +0900
+++ b/shuzai/tokusan/tyouri.html	Tue Dec 15 19:00:56 2015 +0900
@@ -8,7 +8,7 @@
 
 -->
 </style>
-<link rel="stylesheet" type="text/css" href="main.css">
+<link rel="stylesheet" type="text/css" href="tokousan.css">
 </head>
 
 <body>

yatex.org