fix conflict test_cursor.c
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Fri, 9 Mar 2012 06:19:29 +0000 (15:19 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Fri, 9 Mar 2012 06:19:29 +0000 (15:19 +0900)
commit275ec067443afc9d88a19c659aa7af396701371f
treec81553d5928b5b239ed610eb9ba6faf7682719a5
parent113935d3ab67dcb85ddaf0b6d02f8385fdfb81c2
fix conflict test_cursor.c
src/bin/test_cursor.c