elementary - removed unintended conflicted lines

that was introduced by a61bbe7dcf0c6936e3104b35d56a7ed330da4176
This commit is contained in:
ChunEon Park 2013-11-04 22:19:09 +09:00
parent f0371f458e
commit 10b8e9763f
1 changed files with 0 additions and 1 deletions

View File

@ -102,7 +102,6 @@ Additions:
* Add elm_slider_step_get(), elm_slider_step_set() for slider.
* Add multi select mode for genlist/gengrid.
* Add ELM_OBJECT_MULTIPLE_SELECT_MODE_WITH_CONTROL select mode for genlist/gengrid.
>>>>>>> parent of f67ecb2... popup: Added support for popup move. elm_popup_move.
Improvements: