diff options
| author |  kwzrd <[email protected]> | 2020-03-15 19:57:11 +0100 |
|---|---|---|
| committer | kwzrd <[email protected]> | 2020-03-15 19:57:11 +0100 |
| commit | b9808a82c41c81d0501a713f854e93a0e5f2054a (patch) | |
| tree | 1175115cce8e36d4ab4a3c28b4c67806da928dd9 /bot/bot.py | |
| parent | Deseasonify: move the branding module from seasons to bot directory (diff) | |
| parent | Merge pull request #371 from ks129/help (diff) | |
Merge branch 'master' into seasonal-purge
This merges the newly added help cog.
Resolve slight conflict in the __main__ module caused by the the master
branch still assuming the presence of the legacy season manager cog.
Diffstat (limited to '')
| -rw-r--r-- | bot/bot.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -32,7 +32,7 @@ class SeasonalBot(commands.Bot): # Unload all cogs extensions = list(self.extensions.keys()) for extension in extensions: - if extension != "bot.seasons": # We shouldn't unload the manager. + if extension not in ["bot.branding", "bot.help"]: # We shouldn't unload the manager and help. self.unload_extension(extension) # Load in the list of cogs that was passed in here |