changeset 2867:b475c9acefe2

merged
author ISHIKAWA MAI <c113017@e.koeki-u.ac.jp>
date Tue, 01 Dec 2015 19:15:34 +0900
parents f0f048348d54
children daf004a057a6
files syuzai/syuzai.html
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/syuzai/syuzai.html	Tue Dec 01 19:14:47 2015 +0900
+++ b/syuzai/syuzai.html	Tue Dec 01 19:15:34 2015 +0900
@@ -53,9 +53,7 @@
      src="mogumogu/mogumogu.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="./ijyuu.html"><img src="iturn/i20091123-1450-00.jpg" width="150" height="100"></a></th>
 
 <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="tsuri/tsuri.html"><img src="tsuri/tsuri.JPG"></a></th></tr></tr>

yatex.org