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

[framework/uifw/elementary.git] / src / bin / test_win_plug.c

diff --git a/src/bin/test_win_plug.c b/src/bin/test_win_plug.c
index 8f00a7c..ef2aafa 100755 (executable)
--- a/src/bin/test_win_plug.c
+++ b/src/bin/test_win_plug.c
@@ -89,6 +89,7 @@ test_win_plug(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(bg);
 
+<<<<<<< HEAD
 
    plug = elm_plug_add(win);
    if (!elm_plug_connect(plug, "ello", 0, EINA_FALSE))
@@ -97,6 +98,14 @@ test_win_plug(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
           return;
        }
 
+=======
+   plug = elm_plug_add(win);
+   if (!elm_plug_connect(plug, "ello", 0, EINA_FALSE))
+     {
+        printf("Cannot connect plug\n");
+        return;
+     }
+>>>>>>> remotes/origin/upstream
 
    evas_object_resize(plug, 380, 500);
    evas_object_move(plug, 10, 10);