migration merge<Jiyoun Park>

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

diff --git a/src/examples/image_example_01.c b/src/examples/image_example_01.c
index 5903f56..f3b2652 100644 (file)
--- a/src/examples/image_example_01.c
+++ b/src/examples/image_example_01.c
@@ -36,11 +36,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
      }
 
    elm_image_no_scale_set(image, EINA_TRUE);
-<<<<<<< HEAD
-   elm_image_scale_set(image, EINA_FALSE, EINA_TRUE);
-=======
    elm_image_resizable_set(image, EINA_FALSE, EINA_TRUE);
->>>>>>> remotes/origin/upstream
    elm_image_smooth_set(image, EINA_FALSE);
    elm_image_orient_set(image, ELM_IMAGE_FLIP_HORIZONTAL);
    elm_image_aspect_fixed_set(image, EINA_TRUE);