Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / src / examples / list_example_02.c

diff --git a/src/examples/list_example_02.c b/src/examples/list_example_02.c
index b4e3588..d4c74a4 100644 (file)
--- a/src/examples/list_example_02.c
+++ b/src/examples/list_example_02.c
@@ -69,7 +69,11 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
 
    /* enable multiple selection and always select */
    elm_list_multi_select_set(li, EINA_TRUE);
+<<<<<<< HEAD
    elm_list_always_select_mode_set(li, EINA_TRUE);
+=======
+   elm_list_select_mode_set(li, ELM_OBJECT_SELECT_MODE_ALWAYS);
+>>>>>>> remotes/origin/upstream
 
    /* set bounce and scroller policy */
    elm_list_bounce_set(li, EINA_TRUE, EINA_TRUE);