Skip to content
Snippets Groups Projects
Commit 7d4a52f6 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix rlva merge error

parent 596a91bb
No related branches found
No related tags found
No related merge requests found
...@@ -435,8 +435,8 @@ namespace RlvStringKeys ...@@ -435,8 +435,8 @@ namespace RlvStringKeys
inline constexpr std::string_view RecvIm = "blocked_recvim"sv; inline constexpr std::string_view RecvIm = "blocked_recvim"sv;
inline constexpr std::string_view RecvImRemote = "blocked_recvim_remote"sv; inline constexpr std::string_view RecvImRemote = "blocked_recvim_remote"sv;
inline constexpr std::string_view SendIm = "blocked_sendim"sv; inline constexpr std::string_view SendIm = "blocked_sendim"sv;
inline constexpr std::string_view Share = make_string_view("blocked_share"); inline constexpr std::string_view Share = "blocked_share";
inline constexpr std::string_view ShareGeneric = make_string_view("blocked_share_generic"); inline constexpr std::string_view ShareGeneric = "blocked_share_generic";
inline constexpr std::string_view StartConference = "blocked_startconf"sv; inline constexpr std::string_view StartConference = "blocked_startconf"sv;
inline constexpr std::string_view StartIm = "blocked_startim"sv; inline constexpr std::string_view StartIm = "blocked_startim"sv;
inline constexpr std::string_view Teleport = "blocked_teleport"sv; inline constexpr std::string_view Teleport = "blocked_teleport"sv;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment