fix merge error
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 15 Feb 2012 08:21:21 +0000 (17:21 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 15 Feb 2012 08:21:21 +0000 (17:21 +0900)
commit4e48b1347e120f81ef692ab02e1488adf5f67a3f
tree5c468b1426267a7db9659e0d8eb47d396e7f1b9d
parent990d38cea057380661ed7988782e7ca3a10ca94f
fix merge error
src/lib/elc_multibuttonentry.c
src/lib/elm_entry.c