migration merge<Jiyoun Park>

[framework/uifw/elementary.git] / doc / widgets / widget_preview_image.c

diff --git a/doc/widgets/widget_preview_image.c b/doc/widgets/widget_preview_image.c
index 6bcbd29..cc727ab 100644 (file)
--- a/doc/widgets/widget_preview_image.c
+++ b/doc/widgets/widget_preview_image.c
@@ -5,11 +5,7 @@ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 elm_win_resize_object_add(win, o);
 
 elm_image_file_set(o, PACKAGE_DATA_DIR"/images/logo_small.png", NULL);
-<<<<<<< HEAD
-elm_image_scale_set(o, EINA_FALSE, EINA_FALSE);
-=======
 elm_image_resizable_set(o, EINA_FALSE, EINA_FALSE);
->>>>>>> remotes/origin/upstream
 evas_object_show(o);
 
 #include "widget_preview_tmpl_foot.c"