Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...

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

diff --git a/doc/widgets/widget_preview_mapbuf.c b/doc/widgets/widget_preview_mapbuf.c
index e150182..bc547f0 100644 (file)
--- a/doc/widgets/widget_preview_mapbuf.c
+++ b/doc/widgets/widget_preview_mapbuf.c
@@ -17,11 +17,7 @@ for (i = 0; i < 8; i++)
        {
           Evas_Object *ic = elm_icon_add(win);
           elm_icon_standard_set(ic, "home");
-<<<<<<< HEAD
-          elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
-=======
           elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
->>>>>>> remotes/origin/upstream
           evas_object_show(ic);
           elm_table_pack(tb, ic, i, j, 1, 1);
        }