Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 1351:32ab58048630

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author HAGITA Akane<c113133@e.koeki-u.ac.jp>
date Tue, 15 Dec 2015 19:08:24 +0900
parents 7a1a2cf4916b
children 22d533c19aa5
files shuzai/tokusan/kudamono.html
diffstat 1 files changed, 1 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/shuzai/tokusan/kudamono.html	Tue Dec 15 19:06:58 2015 +0900
+++ b/shuzai/tokusan/kudamono.html	Tue Dec 15 19:08:24 2015 +0900
@@ -5,7 +5,7 @@
 <title>果物コーナー</title>
 <style type="text/css">
 </style>
-<link rel="stylesheet" type="text/css" href="../../skip.css">
+
 <link rel="stylesheet" type="text/css" href="tokusan.css">
 </head>
 
@@ -17,43 +17,15 @@
 <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