diff options
Diffstat (limited to 'src/Api.cpp')
| -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)); |