3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout...

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

diff --git a/src/examples/index_example_02.c b/src/examples/index_example_02.c
index 4c67d03..5e2df84 100644 (file)
--- a/src/examples/index_example_02.c
+++ b/src/examples/index_example_02.c
@@ -34,11 +34,7 @@ _index_changed(void        *data __UNUSED__,
                Evas_Object *obj __UNUSED__,
                void        *event_info)
 {
-<<<<<<< HEAD
-   elm_gengrid_item_bring_in(event_info);
-=======
    elm_gengrid_item_bring_in(event_info, ELM_GENGRID_ITEM_SCROLLTO_IN);
->>>>>>> remotes/origin/upstream
 }
 
 static void
@@ -101,11 +97,7 @@ elm_main(int    argc __UNUSED__,
          char **argv __UNUSED__)
 {
    Evas_Object *win, *bg, *grid, *index;
-<<<<<<< HEAD
-   Elm_Gengrid_Item *it;
-=======
    Elm_Object_Item *gg_it;
->>>>>>> remotes/origin/upstream
    unsigned int i;
 
    Elm_Gengrid_Item_Class gic;
@@ -142,19 +134,11 @@ elm_main(int    argc __UNUSED__,
      {
         char buf[32];
 
-<<<<<<< HEAD
-        it = elm_gengrid_item_append(grid, &gic, (void *)i, NULL, NULL);
-
-        /* indexing by first letters */
-        snprintf(buf, sizeof(buf), "%c", items[i][0]);
-        elm_index_item_sorted_insert(index, buf, it, _index_icmp, NULL);
-=======
         gg_it = elm_gengrid_item_append(grid, &gic, (void *)i, NULL, NULL);
 
         /* indexing by first letters */
         snprintf(buf, sizeof(buf), "%c", items[i][0]);
         elm_index_item_sorted_insert(index, buf, NULL, gg_it, _index_icmp, NULL);
->>>>>>> remotes/origin/upstream
      }
 
    evas_object_smart_callback_add(index, "delay,changed", _index_changed, NULL);