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 /include/tgbot/Api.h | |
| parent | 6a7b90d1b1c434eea3d167fa02e6ae449c415676 (diff) | |
Fix merge
Diffstat (limited to 'include/tgbot/Api.h')
| -rw-r--r-- | include/tgbot/Api.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/tgbot/Api.h b/include/tgbot/Api.h index cba4b56..0a2b7bd 100644 --- a/include/tgbot/Api.h +++ b/include/tgbot/Api.h @@ -66,18 +66,11 @@ public: * @param disableWebPagePreview Optional. Disables link previews for links in this message. * @param replyToMessageId Optional. If the message is a reply, ID of the original message. * @param replyMarkup Optional. Additional interface options. An object for a custom reply keyboard, instructions to hide keyboard or to force a reply from the user. -<<<<<<< HEAD * @param parseMode Optional. Set it to "Markdown" or "HTML" if you want Telegram apps to show bold, italic, fixed-width text or inline URLs in your bot's message. - * @return On success, the sent message is returned. - */ - Message::Ptr sendMessage(int64_t chatId, const std::string& text, bool disableWebPagePreview = false, int32_t replyToMessageId = 0, const GenericReply::Ptr& replyMarkup = GenericReply::Ptr(), const std::string& parseMode = "") const; -======= * @param disableNotification Optional. Sends the message silenty. * @return On success, the sent message is returned. */ - Message::Ptr sendMessage(int64_t chatId, const std::string& text, bool disableWebPagePreview = false, - int32_t replyToMessageId = 0,const GenericReply::Ptr& replyMarkup = GenericReply::Ptr(), bool disableNotification = false) const; ->>>>>>> 9ba69d7e87c9b8ff9997294b68550852ef0274b8 + Message::Ptr sendMessage(int64_t chatId, const std::string& text, bool disableWebPagePreview = false, int32_t replyToMessageId = 0, const GenericReply::Ptr& replyMarkup = GenericReply::Ptr(), const std::string& parseMode = "", bool disableNotification = false) const; /** * Use this method to forward messages of any kind. |