fix conflicts

2020-12-04 19:05:58 -06:00
parent 9f54345f5c 6ea7fce828
commit 0354036451
22 changed files with 564 additions and 157 deletions
--- a/discord/ext/commands/bot.py
+++ b/discord/ext/commands/bot.py
@@ -30,12 +30,11 @@ import inspect
 import importlib.util
 import sys
 import traceback
-import re
 import types

 import discord

-from .core import GroupMixin, Command
+from .core import GroupMixin
 from .view import StringView
 from .context import Context
 from . import errors