changeset 15:3eea721482e7

merged
author kazz <kazz@cr.ie.u-ryukyu.ac.jp>
date Fri, 19 Feb 2010 06:58:35 +0900
parents 9cf8a7a045a0
children ec57fdd8c880
files test
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/test	Fri Feb 19 06:56:54 2010 +0900
+++ b/test	Fri Feb 19 06:58:35 2010 +0900
@@ -1,7 +1,5 @@
 aaaaaaaaaaaa
-
-aaaaaa
 faslkdfj
 sdafdsafsdaf
-aaaaa
+test
 asdfjla;skdfj
\ No newline at end of file