migration merge<Jiyoun Park>

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

diff --git a/src/examples/icon_example_01.c b/src/examples/icon_example_01.c
index b9fe1c6..8fc365d 100644 (file)
--- a/src/examples/icon_example_01.c
+++ b/src/examples/icon_example_01.c
@@ -38,11 +38,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
    printf("path = %s, group = %s, name = %s\n", path, group, name);
 
    elm_icon_no_scale_set(icon, EINA_TRUE);
-<<<<<<< HEAD
-   elm_icon_scale_set(icon, EINA_FALSE, EINA_TRUE);
-=======
    elm_icon_resizable_set(icon, EINA_FALSE, EINA_TRUE);
->>>>>>> remotes/origin/upstream
    elm_icon_smooth_set(icon, EINA_FALSE);
    elm_icon_fill_outside_set(icon, EINA_TRUE);