# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1256223551 -32400
# Node ID 6929c1c5e5deca22ed34298ac6becad4ce2dcd5b
# Parent  167546b55062437734010b859c0cdbb96818c8c4
fix tag

diff -r 167546b55062 -r 6929c1c5e5de .hgtags
--- a/.hgtags	Thu Oct 22 23:56:35 2009 +0900
+++ b/.hgtags	Thu Oct 22 23:59:11 2009 +0900
@@ -1,14 +1,4 @@
 ce5755f544c1a882c7e28b7c78d8b31a82bd9eda cvs
 1f4c3f3238e6278fa3c73594e027036a1404ec34 fullHD_omedetou
 30568cef3899caea3db0fb9e28b0e6f889c60679 double-linked-task-list
-<<<<<<< local
-0000000000000000000000000000000000000000 ball_bound
-0000000000000000000000000000000000000000 513
-53f6939d7c970bbde5bbe9f32b64463f4ded8f01 ball_bound
-=======
-f8d9830d94cda230d8d544002436a1462a5f8949 ball_bound
-2bc1e486e71d12555fa31ea16b8d47a1bbbee20a ball_bound
-2bc1e486e71d12555fa31ea16b8d47a1bbbee20a -r
-2bc1e486e71d12555fa31ea16b8d47a1bbbee20a 513
->>>>>>> other
 8fca17aa57dfe07aeff46a3ae1707c795c762d72 examples