diff options
| -rw-r--r-- | bot/__main__.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/bot/__main__.py b/bot/__main__.py index c598fd921..e280a2479 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -60,11 +60,8 @@ if not DEBUG_MODE: bot.load_extension("bot.cogs.verification") # Feature cogs -<<<<<<< HEAD -======= bot.load_extension("bot.cogs.alias") bot.load_extension("bot.cogs.deployment") ->>>>>>> master bot.load_extension("bot.cogs.defcon") bot.load_extension("bot.cogs.deployment") bot.load_extension("bot.cogs.eval") |