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/ext/commands/converter.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'discord/ext/commands/converter.py')

diff --git a/discord/ext/commands/converter.py b/discord/ext/commands/converter.py
index fdce15d1..78c9bbf4 100644
--- a/discord/ext/commands/converter.py
+++ b/discord/ext/commands/converter.py
@@ -31,11 +31,24 @@ import discord
 
 from .errors import BadArgument, NoPrivateMessage
 
-__all__ = ['Converter', 'MemberConverter', 'UserConverter', 'MessageConverter',
-           'TextChannelConverter', 'InviteConverter', 'RoleConverter',
-           'GameConverter', 'ColourConverter', 'VoiceChannelConverter',
-           'EmojiConverter', 'PartialEmojiConverter', 'CategoryChannelConverter',
-           'IDConverter', 'clean_content', 'Greedy']
+__all__ = (
+    'Converter',
+    'MemberConverter',
+    'UserConverter',
+    'MessageConverter',
+    'TextChannelConverter',
+    'InviteConverter',
+    'RoleConverter',
+    'GameConverter',
+    'ColourConverter',
+    'VoiceChannelConverter',
+    'EmojiConverter',
+    'PartialEmojiConverter',
+    'CategoryChannelConverter',
+    'IDConverter',
+    'clean_content',
+    'Greedy',
+)
 
 def _get_from_guilds(bot, getter, argument):
     result = None
-- 
cgit v1.2.3