Skip to content
Snippets Groups Projects
Commit 89cbc6a5 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Fix bad merge 

Yes, I made a mess. I should read more carefully, when I resolve
conflicts... .-.
parent 53d1321e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/mtx/events/collections.hpp
+ 1
− 0
View file @ 89cbc6a5
......@@ -176,6 +176,7 @@ constexpr inline EventType message_content_to_type<mtx::events::msg::Text> = Eve
template<>
constexpr inline EventType message_content_to_type<mtx::events::msg::Video> =
EventType::RoomMessage;
template<>
constexpr inline EventType message_content_to_type<mtx::events::msg::StickerImage> =
EventType::Sticker;
template<>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment