changeset 328:a3c2daf3ffa4

merge
author TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
date Sat, 31 Aug 2013 14:52:34 +0900
parents acff674bfd38
children bf1dbc4e6918
files enq/kikuti.html index.html picture/ayae-80.jpg picture/ayae.jpg picture/chokai-80.jpg picture/chokai.jpg picture/kei.jpg picture/kei1-80.jpg picture/murakami-80.jpg picture/murakami.jpg picture/oyamada-80.jpg picture/oyamada.jpg picture/rina-80.jpg picture/rina.jpg syuzai/dezima.html
diffstat 15 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/enq/kikuti.html	Sat Aug 31 16:58:40 2013 +0900
+++ b/enq/kikuti.html	Sat Aug 31 14:52:34 2013 +0900
@@ -107,4 +107,4 @@
  </ol>
 </div>
  </body>
-</html>
\ No newline at end of file
+</html>ko
\ No newline at end of file
--- a/index.html	Sat Aug 31 16:58:40 2013 +0900
+++ b/index.html	Sat Aug 31 14:52:34 2013 +0900
@@ -56,14 +56,12 @@
 <table style="border-collapse: collapse; margin-left:
  auto; margin-right: auto;">
  <tr>
-  <td><a href="staff/ayae/index.html"><img src="picture/ayae-100.jpg" alt="あやえ"></a></td>
-  <td><a href="staff/kei/index.html"><img src="picture/" alt="kei"></a></td>
- <td><a href="staff/masaki/index.html"><img src="picture/" alt="村上"></a></td>
-<td><a href="staff/rina/index.html"><img src="picture/" alt="rina&#9825;"></a></td>
-<td><a href="staff/oyamada/index.html"><img src="picture/" alt="小山田"></a></td>
-<td><a href="staff/chokai/index.html"><img src="picture/" alt="chokai"></a></td>
-<td><a href="staff/yuuji/index.html"><img src="picture/" alt="yuuji"></a></td>
-
+  <td><a href="staff/ayae/index.html"><img src="picture/ayae-80.jpg" alt="あやえ"></a></td>
+  <td><a href="staff/kei/index.html"><img src="picture/kei1-80.jpg" alt="kei"></a></td>
+ <td><a href="staff/masaki/index.html"><img src="picture/murakami-80.jpg" alt="村上"></a></td>
+<td><a href="staff/rina/index.html"><img src="picture/rina-80.jpg" alt="rina&#9825;"></a></td>
+<td><a href="staff/oyamada/index.html"><img src="picture/oyamada-80.jpg" alt="小山田"></a></td>
+<td><a href="staff/chokai/index.html"><img src="picture/chokai-80.jpg" alt="chokai"></a></td>
 </tr>
 </table>
 
Binary file picture/ayae-80.jpg has changed
Binary file picture/ayae.jpg has changed
Binary file picture/chokai-80.jpg has changed
Binary file picture/chokai.jpg has changed
Binary file picture/kei.jpg has changed
Binary file picture/kei1-80.jpg has changed
Binary file picture/murakami-80.jpg has changed
Binary file picture/murakami.jpg has changed
Binary file picture/oyamada-80.jpg has changed
Binary file picture/oyamada.jpg has changed
Binary file picture/rina-80.jpg has changed
Binary file picture/rina.jpg has changed
--- a/syuzai/dezima.html	Sat Aug 31 16:58:40 2013 +0900
+++ b/syuzai/dezima.html	Sat Aug 31 14:52:34 2013 +0900
@@ -1,3 +1,5 @@
+
+
 <html>
 <head>
 <title>出島 取材</title>

yatex.org