From cb52e627968495194dd3923a9056a58416ba3283 Mon Sep 17 00:00:00 2001
From: ComputerMaster1st <mr_m.a_thompson@hotmail.co.uk>
Date: Wed, 10 Oct 2018 23:18:24 +0100
Subject: [PATCH] Removed old code from pull merge

---
 src/Discord.Net.WebSocket/DiscordSocketClient.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 4a54545b5..14423c1f0 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -251,12 +251,8 @@ namespace Discord.WebSocket
                 await heartbeatTask.ConfigureAwait(false);
             _heartbeatTask = null;
 
-<<<<<<< HEAD
-            while (_heartbeatTimes.TryDequeue(out _)) { }
-=======
             // Check if hearbeatTimes is not empty before dequeuing. TryDequeue can cause blocking.
             if (!_heartbeatTimes.IsEmpty) while (_heartbeatTimes.TryDequeue(out long time)) { }
->>>>>>> Disconnecting block fix
             _lastMessageTime = 0;
 
             await _gatewayLogger.DebugAsync("Waiting for guild downloader").ConfigureAwait(false);