Mercurial > hgrepos > hgweb.cgi > skipweb
changeset 2248:7c4e43f274a1
merge
| author | TAGUCHI Ayae <c112093@h.koeki-u.ac.jp> |
|---|---|
| date | Fri, 21 Feb 2014 10:29:59 +0900 |
| parents | 20df480a628c |
| children | dd77a0ec13e9 |
| files | index.html |
| diffstat | 1 files changed, 0 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Fri Feb 21 10:13:04 2014 +0900 +++ b/index.html Fri Feb 21 10:29:59 2014 +0900 @@ -6,9 +6,6 @@ </head> <body> -<<<<<<< local -======= - <div class="side_photo_right"> <p><a href="syuzai/dezima.html"> <img src="syuzai/dezima4-150.JPG" alt="dezima" width="" style="align: right;"> @@ -36,7 +33,6 @@ </a></p> </div> ->>>>>>> other <div class="fix"> <div class="menu"> <table style="border-collapse: collapse; margin-left: @@ -48,34 +44,6 @@ </div> </div> -<div class="base_sheet"> -<div class="side_photo_right"> -<p><a href="syuzai/dezima.html"> -<img src="syuzai/dezima4-150.JPG" alt="dezima" width="" style="align: right;"> -</a></p> -<p><a href="syuzai/nisimura.html"> -<img src="syuzai/nisimura1-150.JPG" alt="nisimura" width="" style="align: right;"> -</a></p> -<p><a href="enq/ogawaen.html"> -<img src="syuzai/ogawaen1-150.jpg" alt="photo" width="" style="align: right;"> -</a></p> -<p><a href="enq/pom.html"> -<img src="syuzai/pom3-150.jpg" alt="photo" width="" style="align: right;"> -</a></p> -<p><a href="index.html"> -<img src="syuzai/romantei2-150.jpg" alt="photo" width="" style="align: right;"> -</a></p> -<p><a href="url"> -<img src="syuzai/rupo1-150.jpg" alt="photo" width="" style="align: right;"> -</a></p> -<p><a href="syuzai/tukusi.html"> -<img src="syuzai/tukusi1-150.JPG" alt="photo" width="" style="align: right;"> -</a></p> -<p><a href="enq/als.html"> -<img src="syuzai/ars1-150.jpg" alt="photo" width="" style="align: right;"> -</a></p> -</div> - <div class="main_title"> <img src="skip-kamo-small.png" alt="kamon"> </div> @@ -109,6 +77,5 @@ </table> </div> -</div> </body> </html>
