[widget] resolve conflict using elm_widget_focus_region_show

Change-Id: I3f08495c19ce2d80bed080b425ca2c4f864ff2b1

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 346b2f4ab697f5824a47a845ce102fb2ed3505ab..1b830610296a0ce0e589e5ec228b90ae7c7fa712 100644 (file)
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -850,10 +850,6 @@ _parent_focus(Evas_Object *obj, Elm_Object_Item *item)
      {
         sd->focused = EINA_TRUE;
         eo_do(obj, elm_obj_widget_on_focus(item));
-<<<<<<< HEAD
-        elm_widget_focus_region_show(obj);
-=======
->>>>>>> opensource/master
      }
    sd->focus_order_on_calc = EINA_FALSE;