From e1a309e93bc30da8de86bef12fd1938693932eff Mon Sep 17 00:00:00 2001 From: Craig Edwards Date: Sun, 20 Oct 2024 10:20:01 +0000 Subject: [PATCH] fix failed merge --- src/dpp/discordvoiceclient.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dpp/discordvoiceclient.cpp b/src/dpp/discordvoiceclient.cpp index f3ed11983e..5b241d1122 100644 --- a/src/dpp/discordvoiceclient.cpp +++ b/src/dpp/discordvoiceclient.cpp @@ -439,7 +439,6 @@ uint16_t discord_voice_client::get_iteration_interval() { return this->iteration_interval; } -} discord_voice_client& discord_voice_client::send_stop_frames(bool send_now) { uint8_t silence_frames[sizeof(silence_packet) / sizeof(*silence_packet) * 5]; for (size_t i = 0; i < sizeof(silence_frames) / sizeof(*silence_frames); i++) { @@ -451,4 +450,4 @@ discord_voice_client& discord_voice_client::send_stop_frames(bool send_now) { return *this; } -} // namespace dpp +}