Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 3043:5154ce5c6575

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tokusan.css
author AMANO Yuka,c113004@e.koeki-u.ac.jp <AMANO Yuka,c113004@e.koeki-u.ac.jp>
date Tue, 15 Dec 2015 18:59:51 +0900
parents 539b754ae5fe (current diff) 4a74e40a1ea9 (diff)
children e0348ccba285
files
diffstat 12 files changed, 28 insertions(+), 0 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/kudamono.html	Tue Dec 15 18:57:49 2015 +0900
+++ b/shuzai/tokusan/kudamono.html	Tue Dec 15 18:59:51 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>

yatex.org