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

@@ -243,8 +243,8 @@ class Colour:
@classmethod
def dark_theme(cls):
"""A factory method that returns a :class:'Colour' with a value of ``0x36393F``.
Will appear transparent on Discord's dark theme and be the text colour on Discord's light theme.
"""A factory method that returns a :class:`Colour` with a value of ``0x36393F``.
This will appear transparent on Discord's dark theme.
.. versionadded:: 1.5
"""