migration merge<Jiyoun Park>

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

diff --git a/doc/widgets/widget_preview_icon.c b/doc/widgets/widget_preview_icon.c
index de87ac2..7a2a1e1 100644 (file)
--- a/doc/widgets/widget_preview_icon.c
+++ b/doc/widgets/widget_preview_icon.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_icon_standard_set(o, "home");
-<<<<<<< HEAD
-elm_icon_scale_set(o, EINA_FALSE, EINA_FALSE);
-=======
 elm_icon_resizable_set(o, EINA_FALSE, EINA_FALSE);
->>>>>>> remotes/origin/upstream
 evas_object_show(o);
 
 #include "widget_preview_tmpl_foot.c"