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

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

diff --git a/src/examples/slideshow_example.c b/src/examples/slideshow_example.c
index 09f81ca..b97d859 100644 (file)
--- a/src/examples/slideshow_example.c
+++ b/src/examples/slideshow_example.c
@@ -69,11 +69,7 @@ _first(void        *data,
        Evas_Object *obj __UNUSED__,
        void        *event_info __UNUSED__)
 {
-<<<<<<< HEAD
-   elm_slideshow_show(data);
-=======
    elm_slideshow_item_show(data);
->>>>>>> remotes/origin/upstream
 }
 
 static void
@@ -81,11 +77,7 @@ _last(void        *data,
       Evas_Object *obj __UNUSED__,
       void        *event_info __UNUSED__)
 {
-<<<<<<< HEAD
-   elm_slideshow_show(data);
-=======
    elm_slideshow_item_show(data);
->>>>>>> remotes/origin/upstream
 }
 
 static void