fixing build-error caused by resolving conflict 63/67463/1 submit/tizen/20160426.155122
authorAndrey Klimenko <and.klimenko@samsung.com>
Tue, 26 Apr 2016 15:39:43 +0000 (18:39 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Tue, 26 Apr 2016 15:40:14 +0000 (18:40 +0300)
commit05e4846cf1be683c3e68040edf6a6cae6903cbdc
tree2771ecbbc20f8de23d2a3dad4a658fec4359b90a
parent25e924784128561e2154c5cc4f4798c46163a807
fixing build-error caused by resolving conflict

Change-Id: Ic4c5229d3872235f33690473d6d4175d52173fde
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
src/Conversation/Recipients/View/src/ConvRecipientsPanelView.cpp