From dbc25140bb0f072da2fa43b052eed17077730214 Mon Sep 17 00:00:00 2001 From: Jaehwan Kim Date: Fri, 9 Mar 2012 15:11:16 +0900 Subject: [PATCH] fix conflict test_focus.c --- src/bin/test_focus.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c index eb6d81e..fba4109 100644 --- a/src/bin/test_focus.c +++ b/src/bin/test_focus.c @@ -219,11 +219,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info EVAS_HINT_EXPAND); evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); -<<<<<<< HEAD - elm_scroller_bounce_set(sc, 0, 1); -======= elm_scroller_bounce_set(sc, EINA_FALSE, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_scroller_content_min_limit(sc, 1, 0); elm_box_pack_end(bx2, sc); my_show(sc); -- 2.7.4