Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / src / lib / elm_mapbuf.c

diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index 602bbf2..7d76b78 100644 (file)
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -161,7 +161,11 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
    if (content)
      {
         evas_object_data_set(content, "_elm_leaveme", (void *)1);
+<<<<<<< HEAD
+        elm_widget_sub_object_add(content, obj);
+=======
         elm_widget_sub_object_add(obj, content);
+>>>>>>> remotes/origin/upstream
         evas_object_smart_member_add(content, obj);
         evas_object_clip_set(content, wd->clip);
         evas_object_color_set(wd->clip, 255, 255, 255, 255);