diff options
| author |  Johannes Christ <[email protected]> | 2019-01-01 19:27:17 +0100 |
|---|---|---|
| committer | Johannes Christ <[email protected]> | 2019-01-01 19:27:17 +0100 |
| commit | c866deefe17bcfe89163c31294f01ea31acf305a (patch) | |
| tree | dc9a8ca1ce355277fe71a9c086f1b0acd3b7e1fa | |
| parent | Merge branch 'master' into django (diff) | |
Fix another merge conflict that was leftover.
| -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") |