From 919dbcafb33eb4e2bb595d7e607f525cf2d02178 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Sat, 20 Apr 2019 17:20:58 -0400
Subject: Consistent use of __all__ to prevent merge conflicts.

---
 discord/gateway.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'discord/gateway.py')

diff --git a/discord/gateway.py b/discord/gateway.py
index bc9a17a2..bf51377f 100644
--- a/discord/gateway.py
+++ b/discord/gateway.py
@@ -44,8 +44,13 @@ from .errors import ConnectionClosed, InvalidArgument
 
 log = logging.getLogger(__name__)
 
-__all__ = ['DiscordWebSocket', 'KeepAliveHandler', 'VoiceKeepAliveHandler',
-           'DiscordVoiceWebSocket', 'ResumeWebSocket']
+__all__ = (
+    'DiscordWebSocket',
+    'KeepAliveHandler',
+    'VoiceKeepAliveHandler',
+    'DiscordVoiceWebSocket',
+    'ResumeWebSocket',
+)
 
 class ResumeWebSocket(Exception):
     """Signals to initialise via RESUME opcode instead of IDENTIFY."""
-- 
cgit v1.2.3