elementary - removed unintended conflicted lines
that was introduced by a61bbe7dcf0c6936e3104b35d56a7ed330da4176
This commit is contained in:
parent
f0371f458e
commit
10b8e9763f
|
@ -102,7 +102,6 @@ Additions:
|
||||||
* Add elm_slider_step_get(), elm_slider_step_set() for slider.
|
* Add elm_slider_step_get(), elm_slider_step_set() for slider.
|
||||||
* Add multi select mode for genlist/gengrid.
|
* Add multi select mode for genlist/gengrid.
|
||||||
* Add ELM_OBJECT_MULTIPLE_SELECT_MODE_WITH_CONTROL 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:
|
Improvements:
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue