# HG changeset patch
# User kazz <kazz@cr.ie.u-ryukyu.ac.jp>
# Date 1266530315 -32400
# Node ID 3eea721482e7e28b1b4b2db2061179210b45dc2e
# Parent  9cf8a7a045a0d2a69849114ab35dd1b4734cf136
merged

diff -r 9cf8a7a045a0 -r 3eea721482e7 test
--- 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