fixing build-error caused by resolving conflict

Change-Id: Ic4c5229d3872235f33690473d6d4175d52173fde
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

diff --git a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
index d7c17ce..abcbe7f 100644 (file)
--- a/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
+++ b/src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp
@@ -161,7 +161,7 @@ bool ConvRecipientsPanelView::isMbeVisible() const
 
 std::string ConvRecipientsPanelView::getEntryText() const
 {
-    return mrkupToUtf8(elm_entry_entry_get(m_pEntry));
+    return markupToUtf8(elm_entry_entry_get(m_pEntry));
 }
 
 void ConvRecipientsPanelView::setEntryText(const std::string &utf8)