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

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

diff --git a/src/examples/index_example_01.c b/src/examples/index_example_01.c
index 4a026f6..41d7bbb 100644 (file)
--- a/src/examples/index_example_01.c
+++ b/src/examples/index_example_01.c
@@ -40,11 +40,7 @@ _index_item_del(void        *data,
            data == elm_index_item_data_get(event_info) ? "OK" :
            "FAIL, something went wrong");
 
-<<<<<<< HEAD
-   elm_list_item_del(data);
-=======
    elm_object_item_del(data);
->>>>>>> remotes/origin/upstream
 }
 
 /* delete an index item */
@@ -121,10 +117,6 @@ elm_main(int    argc __UNUSED__,
 {
    Evas_Object *win, *bg, *hbox, *vbox, *bt, *sep;
    Elm_Object_Item *lit;
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
    unsigned int i;
    char curr = 0;
 
@@ -169,12 +161,7 @@ elm_main(int    argc __UNUSED__,
              /* indexing by first letters */
 
              snprintf(buf, sizeof(buf), "%c", curr);
-<<<<<<< HEAD
-
-             elm_index_item_append(d.index, buf, lit);
-=======
              elm_index_item_append(d.index, buf, NULL, lit);
->>>>>>> remotes/origin/upstream
              index_it = elm_index_item_find(d.index, lit);
 
              elm_object_item_del_cb_set(index_it, _index_item_del);