3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout...

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

diff --git a/src/bin/test_gesture_layer2.c b/src/bin/test_gesture_layer2.c
index 28c6b61..b2b0469 100644 (file)
--- a/src/bin/test_gesture_layer2.c
+++ b/src/bin/test_gesture_layer2.c
@@ -502,11 +502,7 @@ Evas_Object *create_gesture_box(Evas_Object *win, icon_properties *icons,
    snprintf(buf, sizeof(buf), "%s/images/g_layer/%s_1.png",
          elm_app_data_dir_get(), icons[idx].name);
    elm_icon_file_set(icons[idx].icon, buf, NULL);
-<<<<<<< HEAD
-   elm_icon_scale_set(icons[idx].icon, 0, 0);
-=======
    elm_icon_resizable_set(icons[idx].icon, 0, 0);
->>>>>>> remotes/origin/upstream
    evas_object_size_hint_align_set(icons[idx].icon, 0.5, 0.5);
    _icon_color_set(&icons[idx], INI_R, INI_G, INI_B, INI_A);
    elm_box_pack_end(bx, icons[idx].icon);