conflict fix

This commit is contained in:
iDutchy
2020-10-28 21:00:48 -05:00
33 changed files with 12183 additions and 3671 deletions

View File

@@ -15,7 +15,7 @@ __title__ = 'discord'
__author__ = 'Rapptz'
__license__ = 'MIT'
__copyright__ = 'Copyright 2015-2020 Rapptz'
__version__ = '1.5.0.3'
__version__ = '1.5.1.4'
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
@@ -61,7 +61,7 @@ from .team import *
VersionInfo = namedtuple('VersionInfo', 'major minor micro releaselevel serial')
version_info = VersionInfo(major=1, minor=5, micro=0, releaselevel='final', serial=0)
version_info = VersionInfo(major=1, minor=5, micro=1, releaselevel='final', serial=0)
try:
from logging import NullHandler