[Elementary migration] panes,flip,notify and slideshow widgets merged.

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

diff --git a/src/examples/flip_example_01.c b/src/examples/flip_example_01.c
index 732b6a7..3de83df 100644 (file)
--- a/src/examples/flip_example_01.c
+++ b/src/examples/flip_example_01.c
@@ -32,28 +32,13 @@ elm_main(int argc, char **argv)
    evas_object_show(rect2);
 
    flip = elm_flip_add(win);
-<<<<<<< HEAD
-   elm_flip_content_front_set(flip, rect);
-   elm_flip_content_back_set(flip, rect2);
-=======
    elm_object_part_content_set(flip, "front", rect);
    elm_object_part_content_set(flip, "back", rect2);
->>>>>>> remotes/origin/upstream
    evas_object_resize(flip, 150, 150);
    evas_object_move(flip, 10, 10);
    evas_object_show(flip);
 
    elm_flip_interaction_set(flip, ELM_FLIP_INTERACTION_PAGE);
-<<<<<<< HEAD
-   elm_flip_interacton_direction_enabled_set(flip, ELM_FLIP_DIRECTION_UP, EINA_TRUE);
-   elm_flip_interacton_direction_enabled_set(flip, ELM_FLIP_DIRECTION_DOWN, EINA_TRUE);
-   elm_flip_interacton_direction_enabled_set(flip, ELM_FLIP_DIRECTION_LEFT, EINA_TRUE);
-   elm_flip_interacton_direction_enabled_set(flip, ELM_FLIP_DIRECTION_RIGHT, EINA_TRUE);
-   elm_flip_interacton_direction_hitsize_set(flip, ELM_FLIP_DIRECTION_UP, 1);
-   elm_flip_interacton_direction_hitsize_set(flip, ELM_FLIP_DIRECTION_DOWN, 1);
-   elm_flip_interacton_direction_hitsize_set(flip, ELM_FLIP_DIRECTION_LEFT, 1);
-   elm_flip_interacton_direction_hitsize_set(flip, ELM_FLIP_DIRECTION_RIGHT, 1);
-=======
    elm_flip_interaction_direction_enabled_set(flip, ELM_FLIP_DIRECTION_UP, EINA_TRUE);
    elm_flip_interaction_direction_enabled_set(flip, ELM_FLIP_DIRECTION_DOWN, EINA_TRUE);
    elm_flip_interaction_direction_enabled_set(flip, ELM_FLIP_DIRECTION_LEFT, EINA_TRUE);
@@ -62,7 +47,6 @@ elm_main(int argc, char **argv)
    elm_flip_interaction_direction_hitsize_set(flip, ELM_FLIP_DIRECTION_DOWN, 1);
    elm_flip_interaction_direction_hitsize_set(flip, ELM_FLIP_DIRECTION_LEFT, 1);
    elm_flip_interaction_direction_hitsize_set(flip, ELM_FLIP_DIRECTION_RIGHT, 1);
->>>>>>> remotes/origin/upstream
 
    radio = elm_radio_add(win);
    elm_object_text_set(radio, "page");