diff options
| author | Oleg Morozenkov <omorozenkov@gmail.com> | 2016-04-18 00:15:23 +0300 |
|---|---|---|
| committer | Oleg Morozenkov <omorozenkov@gmail.com> | 2016-04-18 00:15:23 +0300 |
| commit | 1dc0ee29b3ba8150cc57757b60cabed6e37c5aaf (patch) | |
| tree | 3f6831a291a5d08eafd4440d321abda209e9fcc1 /src | |
| parent | 6a7b90d1b1c434eea3d167fa02e6ae449c415676 (diff) | |
Fix merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/Api.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Api.cpp b/src/Api.cpp index af5e83c..54cb692 100644 --- a/src/Api.cpp +++ b/src/Api.cpp @@ -38,11 +38,7 @@ User::Ptr Api::getMe() const { return TgTypeParser::getInstance().parseJsonAndGetUser(sendRequest("getMe")); } -<<<<<<< HEAD -Message::Ptr Api::sendMessage(int64_t chatId, const string& text, bool disableWebPagePreview, int32_t replyToMessageId, const GenericReply::Ptr& replyMarkup, const string& parseMode) const { -======= -Message::Ptr Api::sendMessage(int64_t chatId, const string& text, bool disableWebPagePreview, int32_t replyToMessageId, const GenericReply::Ptr& replyMarkup, bool disableNotification) const { ->>>>>>> 9ba69d7e87c9b8ff9997294b68550852ef0274b8 +Message::Ptr Api::sendMessage(int64_t chatId, const string& text, bool disableWebPagePreview, int32_t replyToMessageId, const GenericReply::Ptr& replyMarkup, const string& parseMode, bool disableNotification) const { vector<HttpReqArg> args; args.push_back(HttpReqArg("chat_id", chatId)); args.push_back(HttpReqArg("text", text)); |