[JungWooHyun] doing merge job ~

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

diff --git a/src/bin/test_focus3.c b/src/bin/test_focus3.c
index e5fb5cd..6a0bf04 100644 (file)
--- a/src/bin/test_focus3.c
+++ b/src/bin/test_focus3.c
@@ -33,11 +33,7 @@ _add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-<<<<<<< HEAD
-   elm_entry_single_line_set(en, 1);
-=======
    elm_entry_single_line_set(en, EINA_TRUE);
->>>>>>> remotes/origin/upstream
    elm_box_pack_start(bx, en);
    evas_object_show(en);
 }
@@ -82,11 +78,7 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-<<<<<<< HEAD
-   elm_entry_single_line_set(en, 1);
-=======
    elm_entry_single_line_set(en, EINA_TRUE);
->>>>>>> remotes/origin/upstream
    elm_box_pack_end(bx, en);
    evas_object_show(en);
 
@@ -119,8 +111,6 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    evas_object_show(win);
 }
-<<<<<<< HEAD
-=======
 
 static void
 highlight_enabled_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
@@ -312,5 +302,4 @@ test_focus4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_resize(win, 320, 320);
    evas_object_show(win);
 }
->>>>>>> remotes/origin/upstream
 #endif