Fix merge error in TextAutosizer.cpp.
Fix merge error in TextAutosizer.cpp.

[Title] Fix merge error in TextAutosizer.cpp.
[Issue#] N/A
[Problem] Merge conflic messaes exist.
[Cause]
[Solution] Remove conflic message.

Change-Id: Idc926f65363dac863bb66f365665b5ae5c093926

youfoh/webkit-efl,youfoh/webkit-efl,youfoh/webkit-efl,youfoh/webkit-efl,youfoh/webkit-efl,youfoh/webkit-efl,youfoh/webkit-efl,youfoh/webkit-efl,youfoh/webkit-efl,youfoh/webkit-efl,youfoh/webkit-efl