evas : resolve conflict on upstream merge

Change-Id: I3dbb6cffedb054182beda333419313a0d00eff70
Signed-off-by: SangHyeon Jade Lee <sh10233.lee@samsung.com>

diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 29c0238..d9b9a70 100644 (file)
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -441,7 +441,7 @@ _evas_box_efl_gfx_entity_size_set(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED,
 }
 
 //TIZEN_ONLY (20181013): Revert "evas: fix child position when the container is moved"
-/*
+#if 0
 EOLIAN static void
 _evas_box_efl_gfx_entity_position_set(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Eina_Position2D pos)
 {
@@ -457,7 +457,7 @@ _evas_box_efl_gfx_entity_position_set(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUS
    efl_gfx_entity_position_set(efl_super(o, EFL_CANVAS_GROUP_CLASS), pos);
    evas_object_smart_changed(o);
 }
-*/
+#endif
 
 EOLIAN static void
 _evas_box_efl_canvas_group_group_calculate(Eo *o, Evas_Object_Box_Data *priv)